From 691a5fc775fcc96db77280e0a5bd3b4b99f5d1a0 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 9 Dec 2020 11:14:54 +0800 Subject: [PATCH] fix(region): optimized qcloud prepaid instance delete --- pkg/multicloud/qcloud/instance.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/multicloud/qcloud/instance.go b/pkg/multicloud/qcloud/instance.go index 532766ea8e..af35e81721 100644 --- a/pkg/multicloud/qcloud/instance.go +++ b/pkg/multicloud/qcloud/instance.go @@ -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 {