From f2caaf76499e4361635dabf6121a68329458eaee Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 10 Jan 2025 15:04:58 +0800 Subject: [PATCH 1/2] retry read cbs --- tencentcloud/services/cvm/resource_tc_instance.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tencentcloud/services/cvm/resource_tc_instance.go b/tencentcloud/services/cvm/resource_tc_instance.go index b54af8208d..5e794d9982 100644 --- a/tencentcloud/services/cvm/resource_tc_instance.go +++ b/tencentcloud/services/cvm/resource_tc_instance.go @@ -987,7 +987,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{}) err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { disks, err := cbsService.DescribeDiskList(ctx, []*string{instance.SystemDisk.DiskId}) if err != nil { - return resource.NonRetryableError(err) + return tccommon.RetryError(err) } for i := range disks { @@ -1045,7 +1045,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{}) err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { disks, err := cbsService.DescribeDiskList(ctx, dataDiskIds) if err != nil { - return resource.NonRetryableError(err) + return tccommon.RetryError(err) } if v, ok := d.GetOk("data_disks"); ok { @@ -1092,7 +1092,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{}) err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { disks, err := cbsService.DescribeDiskList(ctx, diskIds) if err != nil { - return resource.NonRetryableError(err) + return tccommon.RetryError(err) } for i := range disks { @@ -1174,7 +1174,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{}) err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { disks, err := cbsService.DescribeDiskList(ctx, finalDiskIds) if err != nil { - return resource.NonRetryableError(err) + return tccommon.RetryError(err) } for _, disk := range disks { @@ -1251,7 +1251,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{}) err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { cbsDisks, err = cbsService.DescribeDiskList(ctx, diskIds) if err != nil { - return resource.NonRetryableError(err) + return tccommon.RetryError(err) } for i := range cbsDisks { From e6ee1035748bb623db8a446df7806a72f2b777db Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 10 Jan 2025 15:08:02 +0800 Subject: [PATCH 2/2] add changelog --- .changelog/3072.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3072.txt diff --git a/.changelog/3072.txt b/.changelog/3072.txt new file mode 100644 index 0000000000..bd7e283dd7 --- /dev/null +++ b/.changelog/3072.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_instance: retry reading cbs +```