From 289db3be8eb9fb60690c2bf497fe713dfc3d7ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Mon, 3 Sep 2018 18:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8Daliyun=E7=A3=81=E7=9B=98?=
 =?UTF-8?q?=E5=BE=AA=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/util/aliyun/disk.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/util/aliyun/disk.go b/pkg/util/aliyun/disk.go
index 74fe06c4f8..a27de87d4f 100644
--- a/pkg/util/aliyun/disk.go
+++ b/pkg/util/aliyun/disk.go
@@ -109,6 +109,11 @@ func (self *SDisk) GetId() string {
 }
 
 func (self *SDisk) Delete() error {
+	if _, err := self.storage.zone.region.getDisk(self.DiskId); err == cloudprovider.ErrNotFound {
+		// 未找到disk, 说明disk已经被删除了. 避免回收站中disk-delete循环删除失败
+		log.Errorf("Failed to find disk %s when delete", self.DiskId)
+		return nil
+	}
 	return self.storage.zone.region.deleteDisk(self.DiskId)
 }