From b870531d507ee2450555c5ecfef55d546db83903 Mon Sep 17 00:00:00 2001 From: Kagashino Date: Wed, 11 May 2022 17:15:09 +0800 Subject: [PATCH] fix: mysqlro - kill useless monitor checking --- .../resource_tc_mysql_readonly_instance.go | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/tencentcloud/resource_tc_mysql_readonly_instance.go b/tencentcloud/resource_tc_mysql_readonly_instance.go index 6aa1e9e9ed..4c8d43e899 100644 --- a/tencentcloud/resource_tc_mysql_readonly_instance.go +++ b/tencentcloud/resource_tc_mysql_readonly_instance.go @@ -28,14 +28,12 @@ package tencentcloud import ( "context" "fmt" - "log" - "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" cdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320" sdkError "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" + "log" ) func resourceTencentCloudMysqlReadonlyInstance() *schema.Resource { @@ -209,31 +207,7 @@ func resourceTencentCloudMysqlReadonlyInstanceCreate(d *schema.ResourceData, met // the mysql master instance must have a backup before creating a read-only instance masterInstanceId := d.Get("master_instance_id").(string) - monitor := MonitorService{client: meta.(*TencentCloudClient).apiV3Conn} - err := resource.Retry(2*readRetryTimeout, func() *resource.RetryError { - can, err := monitor.CheckCanCreateMysqlROInstance(ctx, masterInstanceId) - - if err != nil { - sdkErr, ok := err.(*sdkError.TencentCloudSDKError) - if ok { - if sdkErr.Code == "InvalidParameterValue" && strings.Contains(sdkErr.Message, "No objects found") { - return nil - } - } - return resource.NonRetryableError(err) - } - if can { - return nil - } - return resource.RetryableError(fmt.Errorf("waiting master report RealCapacity to monitor too long")) - }) - - if err != nil { - return err - } - - err = resource.Retry(2*readRetryTimeout, func() *resource.RetryError { backups, err := mysqlService.DescribeBackupsByMysqlId(ctx, masterInstanceId, 10) if err != nil { return resource.NonRetryableError(err)