opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9302 from ioito/hotfix/qx-qcloud-instance-delete

Browse Source 
fix(region): optimized qcloud prepaid instance delete
This commit is contained in:
Zexi Li
2020-12-09 20:37:26 +08:00
committed by GitHub
parent ca89a13622 691a5fc775
commit c354e820df
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/qcloud/instance.go
+7 -1
View File
@@ -776,7 +776,13 @@ func (self *SInstance) DeleteVM(ctx context.Context) error {
if err != nil {
return errors.Wrapf(err, "region.DeleteVM(%s)", self.InstanceId)
}
return cloudprovider.WaitDeleted(self, 10*time.Second, 20*time.Minute) // 20minutes
if self.GetBillingType() == billing_api.BILLING_TYPE_PREPAID { // 预付费的需要删除两次
err := self.host.zone.region.DeleteVM(self.InstanceId)
if err != nil {
return errors.Wrapf(err, "region.DeleteVM(%s)", self.InstanceId)
}
}
return cloudprovider.WaitDeleted(self, 10*time.Second, 5*time.Minute) // 5minutes
}
func (self *SRegion) UpdateVM(instanceId string, name, osType string) error {