From 493ea8b0cb9529c3853903f6c0c498b566983cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Wed, 5 Sep 2018 14:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8Daliyun=E7=9B=98=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/hostdrivers/aliyun.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/compute/hostdrivers/aliyun.go b/pkg/compute/hostdrivers/aliyun.go index 4c1d7bf029..f46bde16cb 100644 --- a/pkg/compute/hostdrivers/aliyun.go +++ b/pkg/compute/hostdrivers/aliyun.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) @@ -91,16 +92,19 @@ func (self *SAliyunHostDriver) RequestAllocateDiskOnStorage(ctx context.Context, } func (self *SAliyunHostDriver) RequestDeallocateDiskOnHost(host *models.SHost, storage *models.SStorage, disk *models.SDisk, task taskman.ITask) error { + data := jsonutils.NewDict() if iCloudStorage, err := storage.GetIStorage(); err != nil { return err } else if iDisk, err := iCloudStorage.GetIDisk(disk.GetExternalId()); err != nil { + if err == cloudprovider.ErrNotFound { + task.ScheduleRun(data) + return nil + } return err } else if err := iDisk.Delete(); err != nil { return err - } else { - data := jsonutils.NewDict() - task.ScheduleRun(data) } + task.ScheduleRun(data) return nil }