From 81d40f0a69a00692af5835d1d0d29be7c033e090 Mon Sep 17 00:00:00 2001 From: Dan Wendorf Date: Fri, 28 Oct 2016 05:41:03 -0700 Subject: [PATCH] provider/google Support MySQL 5.7 instances (#9673) * provider/google Document MySQL versions for second generation instances Google Cloud SQL has first-gen and second-gen instances with different supported versions of MySQL. * provider/google Increase SQL Admin operation timeout to 10 minutes Creating SQL instances for MySQL 5.7 can take over 7 minutes, so the timeout needs to be increased to allow the google_sql_database_instance resource to successfully create. --- sqladmin_operation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqladmin_operation.go b/sqladmin_operation.go index 05a2931b..c096bab2 100644 --- a/sqladmin_operation.go +++ b/sqladmin_operation.go @@ -64,7 +64,7 @@ func sqladminOperationWait(config *Config, op *sqladmin.Operation, activity stri } state := w.Conf() - state.Timeout = 5 * time.Minute + state.Timeout = 10 * time.Minute state.MinTimeout = 2 * time.Second opRaw, err := state.WaitForState() if err != nil {