Merge pull request #10137 from ioito/hotfix/qx-disk-delete

fix(region): delete not exist disk failed
This commit is contained in:
Zexi Li
2021-02-04 11:36:56 +08:00
committed by GitHub
+8 -1
View File
@@ -31,6 +31,7 @@ import (
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/cmdline"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/compute/baremetal"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/compute/options"
@@ -291,7 +292,13 @@ func (self *SKVMHostDriver) RequestDeallocateDiskOnHost(ctx context.Context, hos
url := fmt.Sprintf("/disks/%s/delete/%s", storage.Id, disk.Id)
body := jsonutils.NewDict()
_, err := host.Request(ctx, task.GetUserCred(), "POST", url, header, body)
return err
if err != nil {
if errors.Cause(err) == cloudprovider.ErrNotFound {
return task.ScheduleRun(nil)
}
return err
}
return nil
}
func (driver *SKVMHostDriver) RequestDeallocateBackupDiskOnHost(ctx context.Context, host *models.SHost, storage *models.SStorage, disk *models.SDisk, task taskman.ITask) error {