Add retries to SQL user insert and update operations. (#2703)

Merged PR #2703.
GoogleCloudPlatform · Nov 22, 2019 · 8f5e705 · 8f5e705
1 parent 996a70b
commit 8f5e705
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/resources/resource_sql_user.go b/third_party/terraform/resources/resource_sql_user.go
@@ -79,8 +79,13 @@ func resourceSqlUserCreate(d *schema.ResourceData, meta interface{}) error {
 
 	mutexKV.Lock(instanceMutexKey(project, instance))
 	defer mutexKV.Unlock(instanceMutexKey(project, instance))
-	op, err := config.clientSqlAdmin.Users.Insert(project, instance,
-		user).Do()
+	var op *sqladmin.Operation
+	insertFunc := func() error {
+		op, err = config.clientSqlAdmin.Users.Insert(project, instance,
+			user).Do()
+		return err
+	}
+	err = retryTimeDuration(insertFunc, d.Timeout(schema.TimeoutCreate))
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to insert "+
@@ -172,8 +177,13 @@ func resourceSqlUserUpdate(d *schema.ResourceData, meta interface{}) error {
 
 		mutexKV.Lock(instanceMutexKey(project, instance))
 		defer mutexKV.Unlock(instanceMutexKey(project, instance))
-		op, err := config.clientSqlAdmin.Users.Update(project, instance, name,
-			user).Host(host).Do()
+		var op *sqladmin.Operation
+		updateFunc := func() error {
+			op, err = config.clientSqlAdmin.Users.Update(project, instance, name,
+				user).Host(host).Do()
+			return err
+		}
+		err = retryTimeDuration(updateFunc, d.Timeout(schema.TimeoutUpdate))
 
 		if err != nil {
 			return fmt.Errorf("Error, failed to update"+