fix: fail purge disk due to getMastHost failure

This commit is contained in:
Qiu Jian
2023-09-27 14:28:48 +08:00
parent 6485f99763
commit 57a585149f
+4 -2
View File
@@ -116,14 +116,16 @@ func (self *DiskDeleteTask) startDeleteDisk(ctx context.Context, disk *models.SD
return
}
purgeParams := jsonutils.QueryBoolean(self.Params, "purge", false)
host, err := storage.GetMasterHost()
if err != nil && errors.Cause(err) != sql.ErrNoRows {
if err != nil && errors.Cause(err) != sql.ErrNoRows && !purgeParams {
self.OnGuestDiskDeleteCompleteFailed(ctx, disk, jsonutils.NewString("storage.GetMasterHost"))
return
}
isPurge := false
if (host == nil || !host.GetEnabled()) && jsonutils.QueryBoolean(self.Params, "purge", false) {
if (host == nil || !host.GetEnabled()) && purgeParams {
isPurge = true
}
disk.SetStatus(self.UserCred, api.DISK_DEALLOC, "")