From 9e03c14aba2e3bced51f0cf2c24f2597a0a659b7 Mon Sep 17 00:00:00 2001 From: Alain Jobart Date: Tue, 20 Mar 2018 11:18:40 -0700 Subject: [PATCH] Adding better timeouts to mysqladmin shutdown. The defaults of connect-timeout=43200 and shutdown-timeout=3600 are too high here, especially for tests. Signed-off-by: Alain Jobart --- go/vt/mysqlctl/mysqld.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go index d2a82336ee2..63230d48242 100644 --- a/go/vt/mysqlctl/mysqld.go +++ b/go/vt/mysqlctl/mysqld.go @@ -401,6 +401,9 @@ func (mysqld *Mysqld) Shutdown(ctx context.Context, waitForMysqld bool) error { defer os.Remove(cnf) args := []string{ "--defaults-extra-file=" + cnf, + "--shutdown-timeout=300", + "--connect-timeout=30", + "--wait=10", "shutdown", } env := []string{