Skip to content

Commit 33e11b7

Browse files
tongyimingmikatong
and
mikatong
authored
fix(cvm): [123456789] retry read cbs (#3072)
* retry read cbs * add changelog --------- Co-authored-by: mikatong <[email protected]>
1 parent 4b457d4 commit 33e11b7

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.changelog/3072.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_instance: retry reading cbs
3+
```

tencentcloud/services/cvm/resource_tc_instance.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
987987
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
988988
disks, err := cbsService.DescribeDiskList(ctx, []*string{instance.SystemDisk.DiskId})
989989
if err != nil {
990-
return resource.NonRetryableError(err)
990+
return tccommon.RetryError(err)
991991
}
992992

993993
for i := range disks {
@@ -1045,7 +1045,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
10451045
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
10461046
disks, err := cbsService.DescribeDiskList(ctx, dataDiskIds)
10471047
if err != nil {
1048-
return resource.NonRetryableError(err)
1048+
return tccommon.RetryError(err)
10491049
}
10501050

10511051
if v, ok := d.GetOk("data_disks"); ok {
@@ -1092,7 +1092,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
10921092
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
10931093
disks, err := cbsService.DescribeDiskList(ctx, diskIds)
10941094
if err != nil {
1095-
return resource.NonRetryableError(err)
1095+
return tccommon.RetryError(err)
10961096
}
10971097

10981098
for i := range disks {
@@ -1174,7 +1174,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
11741174
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
11751175
disks, err := cbsService.DescribeDiskList(ctx, finalDiskIds)
11761176
if err != nil {
1177-
return resource.NonRetryableError(err)
1177+
return tccommon.RetryError(err)
11781178
}
11791179

11801180
for _, disk := range disks {
@@ -1251,7 +1251,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
12511251
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
12521252
cbsDisks, err = cbsService.DescribeDiskList(ctx, diskIds)
12531253
if err != nil {
1254-
return resource.NonRetryableError(err)
1254+
return tccommon.RetryError(err)
12551255
}
12561256

12571257
for i := range cbsDisks {

0 commit comments

Comments
 (0)