opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit '1607b9a88a61520420b460471978c8965830a69b':
  避免aliyun磁盘循环删除失败
This commit is contained in:
邱剑
2018-09-03 20:47:11 +08:00
parent e3d4e271ac 1607b9a88a
commit 9b27a0bfe0
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aliyun/disk.go
+5
View File
@@ -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)
}