Skip to content

fix: mysqlro - kill useless monitor checking #1039

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.

Sign up for GitHub

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 1 commit into from
May 11, 2022
Merged

fix: mysqlro - kill useless monitor checking #1039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 1 addition & 27 deletions tencentcloud/resource_tc_mysql_readonly_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down