Skip to content

Commit 1cc74ae

Browse files
authored
fix(cynosdb): [134409562] tencentcloud_cynosdb_cluster optimize code logic for update function (#4133)
* add * add
1 parent aecd633 commit 1cc74ae

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

.changelog/4133.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cynosdb_cluster: optimize code logic for update function
3+
```

tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster.go

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"time"
88

99
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
10-
svccdb "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cdb"
1110
svctag "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tag"
1211

1312
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -768,24 +767,24 @@ func resourceTencentCloudCynosdbClusterUpdate(d *schema.ResourceData, meta inter
768767
return err
769768
}
770769

771-
mysqlService := svccdb.NewMysqlService(client)
772-
_ = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
773-
taskStatus, message, err := mysqlService.DescribeAsyncRequestInfo(ctx, asyncRequestId)
774-
if err != nil {
775-
return resource.NonRetryableError(err)
770+
// wait
771+
asyncRequestIdInt := helper.StrToInt64(asyncRequestId)
772+
err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
773+
resp, e := cynosdbService.DescribeFlow(ctx, asyncRequestIdInt)
774+
if e != nil {
775+
return resource.NonRetryableError(e)
776776
}
777777

778-
if taskStatus == svccdb.MYSQL_TASK_STATUS_SUCCESS {
778+
if resp {
779779
return nil
780780
}
781781

782-
if taskStatus == svccdb.MYSQL_TASK_STATUS_INITIAL || taskStatus == svccdb.MYSQL_TASK_STATUS_RUNNING {
783-
return resource.RetryableError(fmt.Errorf("%s modify params task status is %s", clusterId, taskStatus))
784-
}
785-
786-
err = fmt.Errorf("%s create account task status is %s,we won't wait for it finish ,it show message:%s", clusterId, taskStatus, message)
787-
return resource.NonRetryableError(err)
782+
return resource.RetryableError(fmt.Errorf("waiting for cynosdb cluster param updating"))
788783
})
784+
785+
if err != nil {
786+
return err
787+
}
789788
}
790789

791790
// update slave_zone

0 commit comments

Comments
 (0)