Parse 409 error strings to determine retriable status

third_party/terraform/resources/resource_sql_database_instance.go.erb

@@ -494,11 +494,7 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 
 	op, err := config.clientSqlAdmin.Instances.Insert(project, instance).Do()
 	if err != nil {
-		if googleapiError, ok := err.(*googleapi.Error); ok && googleapiError.Code == 409 {
-			return fmt.Errorf("Error, the name %s is unavailable because it was used recently", instance.Name)
-		} else {
-			return fmt.Errorf("Error, failed to create instance %s: %s", instance.Name, err)
-		}
+		return fmt.Errorf("Error, failed to create instance %s: %s", instance.Name, err)
 	}
 
 	d.SetId(instance.Name)

third_party/terraform/utils/utils.go

@@ -350,15 +350,22 @@ func retryTimeDuration(retryFunc func() error, duration time.Duration) error {
 }
 
 func isRetryableError(err error) bool {
-	// 409's are retried because cloud sql throws a 409 when concurrent calls are made
-	if gerr, ok := err.(*googleapi.Error); ok && (gerr.Code == 409 || gerr.Code == 429 || gerr.Code == 500 || gerr.Code == 502 || gerr.Code == 503) {
+	if gerr, ok := err.(*googleapi.Error); ok && (gerr.Code == 429 || gerr.Code == 500 || gerr.Code == 502 || gerr.Code == 503) {
 		return true
 	}
 	// These operations are always hitting googleapis.com - they should rarely
 	// time out, and if they do, that timeout is retryable.
 	if urlerr, ok := err.(*url.Error); ok && urlerr.Timeout() {
 		return true
 	}
+	if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 409 && strings.Contains(gerr.Body, "operationInProgress") {
+		// 409's are retried because cloud sql throws a 409 when concurrent calls are made.
+		// The only way right now to determine it is a SQL 409 due to concurrent calls is to
+		// look at the contents of the error message.
+		// See https://github.com/terraform-providers/terraform-provider-google/issues/3279
+		return true
+	}
+
 	return false
 }