Skip to content

modify mongodb force_delete #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 1.42.1 (Unreleased)

BUG FIXES:
* Resource: `tencentcloud_mongodb_instance` Fix the error of releasing associated resources when destroying mongodb postpaid instance.
* Resource: `tencentcloud_mongodb_sharding_instance` Fix the error of releasing associated resources when destroying mongodb postpaid sharding instance.
* Resource: `tencentcloud_mongodb_standby_instance` Fix the error of releasing associated resources when destroying mongodb postpaid standby instance.

## 1.42.0 (September 8, 2020)

FEATURES:
Expand Down
16 changes: 14 additions & 2 deletions tencentcloud/resource_tc_mongodb_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,18 @@ func resourceTencentCloudMongodbInstanceDelete(d *schema.ResourceData, meta inte
if err != nil {
return err
}

return nil
err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
if err != nil {
log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
return err
}
//describe and check not exist
_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
if errRet != nil {
return errRet
}
if !has {
return nil
}
return fmt.Errorf("[CRITAL]%s mongodb %s fail", logId, "OfflineIsolatedDBInstance")
}
16 changes: 14 additions & 2 deletions tencentcloud/resource_tc_mongodb_sharding_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,18 @@ func resourceMongodbShardingInstanceDelete(d *schema.ResourceData, meta interfac
if err != nil {
return err
}

return nil
err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
if err != nil {
log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
return err
}
//describe and check not exist
_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
if errRet != nil {
return errRet
}
if !has {
return nil
}
return fmt.Errorf("[CRITAL]%s mongodb %s fail", logId, "OfflineIsolatedDBInstance")
}
16 changes: 14 additions & 2 deletions tencentcloud/resource_tc_mongodb_standby_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,18 @@ func resourceTencentCloudMongodbStandbyInstanceDelete(d *schema.ResourceData, me
if err != nil {
return err
}

return nil
err = mongodbService.OfflineIsolatedDBInstance(ctx, instanceId)
if err != nil {
log.Printf("[CRITAL]%s mongodb %s fail, reason:%s", logId, "OfflineIsolatedDBInstance", err.Error())
return err
}
//describe and check not exist
_, has, errRet := mongodbService.DescribeInstanceById(ctx, instanceId)
if errRet != nil {
return errRet
}
if !has {
return nil
}
return fmt.Errorf("[CRITAL]%s mongodb %s fail", logId, "OfflineIsolatedDBInstance")
}
40 changes: 40 additions & 0 deletions tencentcloud/service_tencentcloud_mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,43 @@ func (me *MongodbService) DescribeAsyncRequestInfo(ctx context.Context, asyncId

return nil
}

func (me *MongodbService) OfflineIsolatedDBInstance(ctx context.Context, instanceId string) (errRet error) {
logId := getLogId(ctx)
request := mongodb.NewOfflineIsolatedDBInstanceRequest()
request.InstanceId = &instanceId
defer func() {
if errRet != nil {
log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
}
}()
var response *mongodb.OfflineIsolatedDBInstanceResponse
var err error
err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
ratelimit.Check(request.GetAction())
response, err = me.client.UseMongodbClient().OfflineIsolatedDBInstance(request)
if err != nil {
if ee, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
if ee.Code == "InvalidParameterValue.LockFailed" {
return resource.RetryableError(err)
} else {
return resource.NonRetryableError(err)
}
}
log.Printf("[CRITAL]%s api[%s] fail, reason:%s", logId, request.GetAction(), err.Error())
return resource.NonRetryableError(err)
}
return nil
})
if err != nil {
return err
}
if response != nil && response.Response != nil {
if err = me.DescribeAsyncRequestInfo(ctx, *response.Response.AsyncRequestId); err != nil {
return err
}
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]",
logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
return nil
}