opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: aliyun eip associate instance ignores IncorrectInstanceStatus error

Browse Source
This commit is contained in:
Qiu Jian
2019-11-04 14:36:35 +08:00
parent 92d614a921
commit cbf65e9962
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aliyun/eip.go
+11 -4
View File
@@ -21,6 +21,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -203,10 +204,16 @@ func (self *SEipAddress) GetInternetChargeType() string {
}
func (self *SEipAddress) Associate(instanceId string) error {
err := self.region.AssociateEip(self.AllocationId, instanceId)
if err != nil {
return err
}
err := cloudprovider.Wait(20*time.Second, 60*time.Second, func() (bool, error) {
err := self.region.AssociateEip(self.AllocationId, instanceId)
if err != nil {
if isError(err, "IncorrectInstanceStatus") {
return false, nil
}
return false, errors.Wrap(err, "region.AssociateEip")
}
return true, nil
})
err = cloudprovider.WaitStatus(self, api.EIP_STATUS_READY, 10*time.Second, 180*time.Second)
return err
}