Retry on MySQL database deletion (#613)

linode/databasemysql/resource.go

@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/linode/linodego"
 	"github.com/linode/terraform-provider-linode/linode/helper"
@@ -148,13 +150,19 @@ func deleteResource(ctx context.Context, d *schema.ResourceData, meta interface{
 		return diag.Errorf("Error parsing Linode MySQL database ID %s as int: %s", d.Id(), err)
 	}
 
-	if err := client.DeleteMySQLDatabase(ctx, int(id)); err != nil {
-		return diag.Errorf("failed to delete mysql database %d: %s", id, err)
-	}
-
-	d.SetId("")
+	// We should retry on intermittent deletion errors
+	return diag.FromErr(resource.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
+		err := client.DeleteMySQLDatabase(ctx, int(id))
+		if err != nil {
+			if lerr, ok := err.(*linodego.Error); ok &&
+				lerr.Code == 500 && strings.Contains(lerr.Message, "Unable to delete instance") {
+				return resource.RetryableError(err)
+			}
+			return resource.NonRetryableError(fmt.Errorf("failed to delete mysql database %d: %s", id, err))
+		}
 
-	return nil
+		return nil
+	}))
 }
 
 func createEngineSlug(engine, version string) string {