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

huawei disk detach bugfix

Browse Source
This commit is contained in:
TangBin
2019-11-26 11:34:19 +08:00
parent 35141b5003
commit b09be4b1c0
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/huawei/instance.go
+15 -8
View File
@@ -633,12 +633,19 @@ func (self *SInstance) AttachDisk(ctx context.Context, diskId string) error {
return errors.Wrap(err, "Instance.AttachDisk.AttachDisk")
}
err = cloudprovider.WaitStatusWithDelay(self, api.DISK_READY, 10*time.Second, 5*time.Second, 60*time.Second)
if err != nil {
return errors.Wrap(err, "Instance.AttachDisk.WaitStatusWithDelay")
}
return cloudprovider.Wait(5*time.Second, 60*time.Second, func() (bool, error) {
disk, err := self.host.zone.region.GetDisk(diskId)
if err != nil {
log.Debugf("Instance.AttachDisk.GetDisk %s", err)
return false, nil
}
return nil
if disk.Status == "in-use" {
return true, nil
}
return false, nil
})
}
func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
@@ -648,13 +655,13 @@ func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
}
return cloudprovider.Wait(5*time.Second, 60*time.Second, func() (bool, error) {
err := self.Refresh()
disk, err := self.host.zone.region.GetDisk(diskId)
if err != nil {
log.Debugln(err)
log.Debugf("Instance.DetachDisk.GetDisk %s", err)
return false, nil
}
if self.Status == "available" {
if disk.Status == "available" {
return true, nil
}