Skip to content

feat(redis): [119914522] adjust redis startup logic #2862

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 2 commits into from
Sep 29, 2024
Merged

feat(redis): [119914522] adjust redis startup logic #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed752f
feat(redis): [119914522] adjust redis startup logic
lyu571 Sep 29, 2024
794fb80
add changelog
lyu571 Sep 29, 2024
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
3 changes: 3 additions & 0 deletions .changelog/2862.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_redis_startup_instance_operation: adjust startup status logic
```
21 changes: 8 additions & 13 deletions tencentcloud/services/crs/resource_tc_redis_startup_instance_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"

"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
Expand Down Expand Up @@ -41,7 +40,6 @@ func resourceTencentCloudRedisStartupInstanceOperationCreate(d *schema.ResourceD

var (
request = redis.NewStartupInstanceRequest()
response = redis.NewStartupInstanceResponse()
instanceId string
)
if v, ok := d.GetOk("instance_id"); ok {
Expand All @@ -56,7 +54,6 @@ func resourceTencentCloudRedisStartupInstanceOperationCreate(d *schema.ResourceD
} else {
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
}
response = result
return nil
})
if err != nil {
Expand All @@ -67,21 +64,19 @@ func resourceTencentCloudRedisStartupInstanceOperationCreate(d *schema.ResourceD
d.SetId(instanceId)

service := RedisService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
taskId := *response.Response.TaskId
err = resource.Retry(6*tccommon.ReadRetryTimeout, func() *resource.RetryError {
ok, err := service.DescribeTaskInfo(ctx, instanceId, taskId)
instance, err := service.DescribeRedisInstanceById(ctx, d.Id())
if err != nil {
if _, ok := err.(*sdkErrors.TencentCloudSDKError); !ok {
return resource.RetryableError(err)
} else {
return resource.NonRetryableError(err)
}
return tccommon.RetryError(err, tccommon.InternalError)
}
if ok {
if instance == nil {
return resource.RetryableError(fmt.Errorf("redis instance is nil, retry..."))
}
if *instance.Status == REDIS_STATUS_ONLINE {
return nil
} else {
return resource.RetryableError(fmt.Errorf("startup instance is processing"))
}
log.Printf("[DEBUG]%s api[%s] redis instance status is %v[%s], need 2[online], retry...", logId, request.GetAction(), *instance.Status, REDIS_STATUS[*instance.Status])
return resource.RetryableError(fmt.Errorf("redis instance is %v, need 2, retry...", *instance.Status))
})

if err != nil {
Expand Down
Loading