resource/alicloud_lindorm_instance: Added retry strategy for error co…

…de OperationDenied.OrderProcessing, Instance.IsNotValid
aliyun · Feb 27, 2024 · e4a2d71 · e4a2d71
1 parent 6256761
commit e4a2d71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/alicloud/resource_alicloud_lindorm_instance.go b/alicloud/resource_alicloud_lindorm_instance.go
@@ -631,7 +631,7 @@ func resourceAliCloudLindormInstanceUpdate(d *schema.ResourceData, meta interfac
 		err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-06-15"), StringPointer("AK"), nil, request, &runtime)
 			if err != nil {
-				if IsExpectedErrors(err, []string{"Instance.NotActive"}) || NeedRetry(err) {
+				if IsExpectedErrors(err, []string{"Instance.IsNotValid"}) || NeedRetry(err) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -674,7 +674,7 @@ func resourceAliCloudLindormInstanceUpdate(d *schema.ResourceData, meta interfac
 		err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError {
 			response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-06-15"), StringPointer("AK"), nil, updateLindormInstanceAttributeReq, &runtime)
 			if err != nil {
-				if IsExpectedErrors(err, []string{"Instance.NotActive"}) || NeedRetry(err) {
+				if IsExpectedErrors(err, []string{"Instance.IsNotValid"}) || NeedRetry(err) {
 					wait()
 					return resource.RetryableError(err)
 				}
@@ -1143,7 +1143,7 @@ func UpgradeLindormInstance(d *schema.ResourceData, meta interface{}, request ma
 	err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError {
 		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2020-06-15"), StringPointer("AK"), nil, request, &runtime)
 		if err != nil {
-			if IsExpectedErrors(err, []string{"Instance.NotActive"}) || NeedRetry(err) {
+			if IsExpectedErrors(err, []string{"Instance.NotActive", "OperationDenied.OrderProcessing"}) || NeedRetry(err) {
 				wait()
 				return resource.RetryableError(err)
 			}
@@ -1152,6 +1152,7 @@ func UpgradeLindormInstance(d *schema.ResourceData, meta interface{}, request ma
 		return nil
 	})
 	addDebug(action, response, request)
+
 	if err != nil {
 		return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
 	}
@@ -1161,5 +1162,6 @@ func UpgradeLindormInstance(d *schema.ResourceData, meta interface{}, request ma
 	if _, err := stateConf.WaitForState(); err != nil {
 		return WrapErrorf(err, IdMsg, d.Id())
 	}
+
 	return nil
 }
diff --git a/alicloud/resource_alicloud_lindorm_instance_test.go b/alicloud/resource_alicloud_lindorm_instance_test.go
@@ -689,12 +689,11 @@ func TestAccAliCloudLindormInstance_basic3(t *testing.T) {
 				}),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheck(map[string]string{
-						"disk_category":             "local_ssd_pro",
-						"payment_type":              "PayAsYouGo",
-						"instance_name":             name,
-						"core_spec":                 "lindorm.i2.4xlarge",
-						"file_engine_specification": CHECKSET,
-						"instance_storage":          CHECKSET,
+						"disk_category":    "local_ssd_pro",
+						"payment_type":     "PayAsYouGo",
+						"instance_name":    name,
+						"core_spec":        "lindorm.i2.4xlarge",
+						"instance_storage": CHECKSET,
 					}),
 				),
 			},