@@ -568,10 +568,8 @@ func mysqlCreateInstancePayByMonth(ctx context.Context, d *schema.ResourceData,
568
568
}
569
569
570
570
var response * cdb.CreateDBInstanceResponse
571
- err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
571
+ err := resource .Retry (2 * tccommon .WriteRetryTimeout , func () * resource.RetryError {
572
572
// shadowed response will not pass to outside
573
- clientToken := helper .BuildToken ()
574
- request .ClientToken = & clientToken
575
573
r , inErr := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseMysqlClient ().CreateDBInstance (request )
576
574
if inErr != nil {
577
575
log .Printf ("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n " ,
@@ -581,7 +579,7 @@ func mysqlCreateInstancePayByMonth(ctx context.Context, d *schema.ResourceData,
581
579
return tccommon .RetryError (inErr )
582
580
}
583
581
584
- if r .Response .InstanceIds == nil && clientToken != "" {
582
+ if len ( r .Response .InstanceIds ) < 1 && clientToken != "" {
585
583
return resource .RetryableError (fmt .Errorf ("%s returns nil instanceIds but client token provided, retrying" , request .GetAction ()))
586
584
}
587
585
@@ -621,15 +619,13 @@ func mysqlCreateInstancePayByUse(ctx context.Context, d *schema.ResourceData, me
621
619
}
622
620
623
621
var response * cdb.CreateDBInstanceHourResponse
624
- err := resource .Retry (tccommon .WriteRetryTimeout , func () * resource.RetryError {
622
+ err := resource .Retry (2 * tccommon .WriteRetryTimeout , func () * resource.RetryError {
625
623
// shadowed response will not pass to outside
626
- clientToken := helper .BuildToken ()
627
- request .ClientToken = & clientToken
628
624
r , inErr := meta .(tccommon.ProviderMeta ).GetAPIV3Conn ().UseMysqlClient ().CreateDBInstanceHour (request )
629
625
if inErr != nil {
630
626
return tccommon .RetryError (inErr )
631
627
}
632
- if r .Response .InstanceIds == nil && clientToken != "" {
628
+ if len ( r .Response .InstanceIds ) < 1 && clientToken != "" {
633
629
return resource .RetryableError (fmt .Errorf ("%s returns nil instanceIds but client token provided, retrying" , request .GetAction ()))
634
630
}
635
631
response = r
@@ -1608,7 +1604,7 @@ func resourceTencentCloudMysqlInstanceDelete(d *schema.ResourceData, meta interf
1608
1604
return resource .NonRetryableError (err )
1609
1605
}
1610
1606
}
1611
- if mysqlInfo == nil {
1607
+ if mysqlInfo == nil || * mysqlInfo . Status == 6 {
1612
1608
return nil
1613
1609
} else {
1614
1610
if mysqlInfo .RoGroups != nil && len (mysqlInfo .RoGroups ) > 0 {
0 commit comments