Skip to content

Commit 3f2a789

Browse files
committed
Refactor code
Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
1 parent df4988e commit 3f2a789

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

pkg/ddc/thin/shutdown.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@ func (t *ThinEngine) destroyMaster() (err error) {
6969
if err != nil {
7070
return
7171
}
72-
return
73-
}
74-
75-
// When upgrade Fluid to v1.0.0+ from a lower version, there may be some orphaned configmaps when deleting a ThinRuntime if it's created before the upgradation.
76-
// Detect such orphaned configmaps and clean them up.
77-
err = t.cleanUpOrphanedResources()
78-
if err != nil {
79-
t.Log.Info("WARNING: failed to delete orphaned resource, some resources may not be cleaned up in the cluster", "err", err)
80-
err = nil
72+
} else {
73+
// When upgrade Fluid to v1.0.0+ from a lower version, there may be some orphaned configmaps when deleting a ThinRuntime if it's created before the upgradation.
74+
// Detect such orphaned configmaps and clean them up.
75+
err = t.cleanUpOrphanedResources()
76+
if err != nil {
77+
t.Log.Info("WARNING: failed to delete orphaned resource, some resources may not be cleaned up in the cluster", "err", err)
78+
err = nil
79+
}
8180
}
8281

8382
return

0 commit comments

Comments
 (0)