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

Merge pull request #3558 from tb365/bugfix/tb-bugfix-1110

Browse Source 
huawei disk attach bugfix
This commit is contained in:
yunion-ci-robot
2019-11-12 00:31:19 +08:00
committed by GitHub
parent eceb9a832b d43f31caab
commit 01f5946d35
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/huawei/instance.go
+31 -3
View File
@@ -625,13 +625,41 @@ func (self *SInstance) NextDeviceName() (string, error) {
func (self *SInstance) AttachDisk(ctx context.Context, diskId string) error {
device, err := self.NextDeviceName()
if err != nil {
return err
return errors.Wrap(err, "Instance.AttachDisk.NextDeviceName")
}
return self.host.zone.region.AttachDisk(self.GetId(), diskId, device)
err = self.host.zone.region.AttachDisk(self.GetId(), diskId, device)
if err != nil {
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 nil
}
func (self *SInstance) DetachDisk(ctx context.Context, diskId string) error {
return self.host.zone.region.DetachDisk(self.GetId(), diskId)
err := self.host.zone.region.DetachDisk(self.GetId(), diskId)
if err != nil {
return errors.Wrap(err, "Instance.DetachDisk")
}
return cloudprovider.Wait(5*time.Second, 60*time.Second, func() (bool, error) {
err := self.Refresh()
if err != nil {
log.Debugln(err)
return false, nil
}
if self.Status == "available" {
return true, nil
}
return false, nil
})
}
func (self *SInstance) CreateDisk(ctx context.Context, sizeMb int, uuid string, driver string) error {