Skip to content

Commit e47cdce

Browse files
authored
fix: mysqlro - kill useless monitor checking (#1039)
1 parent 7a28823 commit e47cdce

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

tencentcloud/resource_tc_mysql_readonly_instance.go

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ package tencentcloud
2828
import (
2929
"context"
3030
"fmt"
31-
"log"
32-
"strings"
33-
3431
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
3532
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
3633
cdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320"
3734
sdkError "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
3835
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
36+
"log"
3937
)
4038

4139
func resourceTencentCloudMysqlReadonlyInstance() *schema.Resource {
@@ -209,31 +207,7 @@ func resourceTencentCloudMysqlReadonlyInstanceCreate(d *schema.ResourceData, met
209207
// the mysql master instance must have a backup before creating a read-only instance
210208
masterInstanceId := d.Get("master_instance_id").(string)
211209

212-
monitor := MonitorService{client: meta.(*TencentCloudClient).apiV3Conn}
213-
214210
err := resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
215-
can, err := monitor.CheckCanCreateMysqlROInstance(ctx, masterInstanceId)
216-
217-
if err != nil {
218-
sdkErr, ok := err.(*sdkError.TencentCloudSDKError)
219-
if ok {
220-
if sdkErr.Code == "InvalidParameterValue" && strings.Contains(sdkErr.Message, "No objects found") {
221-
return nil
222-
}
223-
}
224-
return resource.NonRetryableError(err)
225-
}
226-
if can {
227-
return nil
228-
}
229-
return resource.RetryableError(fmt.Errorf("waiting master report RealCapacity to monitor too long"))
230-
})
231-
232-
if err != nil {
233-
return err
234-
}
235-
236-
err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError {
237211
backups, err := mysqlService.DescribeBackupsByMysqlId(ctx, masterInstanceId, 10)
238212
if err != nil {
239213
return resource.NonRetryableError(err)

0 commit comments

Comments
 (0)