opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

huawei disk delete bugfix

Browse Source
This commit is contained in:
TangBin
2019-03-05 12:20:18 +08:00
parent 16320449ec
commit b5a0af72ef
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/huawei/disk.go
+7 -7
View File
@@ -292,17 +292,17 @@ func (self *SDisk) GetAccessPath() string {
}
func (self *SDisk) Delete(ctx context.Context) error {
if _, err := self.storage.zone.region.GetDisk(self.GetId()); err == cloudprovider.ErrNotFound {
if disk, err := self.storage.zone.region.GetDisk(self.GetId()); err == cloudprovider.ErrNotFound {
log.Errorf("Failed to find disk %s when delete", self.GetId())
return nil
} else if disk.Status != "deleting" {
err := self.storage.zone.region.DeleteDisk(self.GetId())
if err != nil {
return err
}
}
err := self.storage.zone.region.DeleteDisk(self.GetId())
if err != nil {
return err
}
return cloudprovider.WaitDeleted(self, 5*time.Second, 120*time.Second)
return cloudprovider.WaitDeleted(self, 10*time.Second, 120*time.Second)
}
func (self *SDisk) CreateISnapshot(ctx context.Context, name string, desc string) (cloudprovider.ICloudSnapshot, error) {