resource/alicloud_ecs_disk_attachment: add retry for DisksDetachingOn…

…EcsExceeded in DetachDisk
aliyun · Apr 15, 2024 · 9312ab4 · 9312ab4
1 parent 17b7803
commit 9312ab4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/alicloud/resource_alicloud_ecs_disk_attachment.go b/alicloud/resource_alicloud_ecs_disk_attachment.go
@@ -100,7 +100,7 @@ func resourceAlicloudEcsDiskAttachmentCreate(d *schema.ResourceData, meta interf
 	err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
 		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
 		if err != nil {
-			if NeedRetry(err) || IsExpectedErrors(err, DiskInvalidOperation) {
+			if NeedRetry(err) || IsExpectedErrors(err, []string{"IncorrectDiskStatus", "IncorrectInstanceStatus", "OperationConflict", "InternalError", "InvalidOperation.Conflict", "IncorrectDiskStatus.Initializing"}) {
 				wait()
 				return resource.RetryableError(err)
 			}
@@ -203,7 +203,7 @@ func resourceAlicloudEcsDiskAttachmentDelete(d *schema.ResourceData, meta interf
 	err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
 		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2014-05-26"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
 		if err != nil {
-			if NeedRetry(err) || IsExpectedErrors(err, DiskInvalidOperation) {
+			if NeedRetry(err) || IsExpectedErrors(err, []string{"DisksDetachingOnEcsExceeded","IncorrectDiskStatus", "IncorrectInstanceStatus", "OperationConflict", "InternalError", "InvalidOperation.Conflict", "IncorrectDiskStatus.Initializing"}) {
 				wait()
 				return resource.RetryableError(err)
 			}