From 60959a0b5cd5eb918f083e3d1179f2e6c9e49f39 Mon Sep 17 00:00:00 2001 From: Damien Ciabrini Date: Wed, 24 Oct 2018 13:27:23 +0200 Subject: [PATCH] mariadb: make security_reset.expect's timeout configurable Under heavy load, when the security_reset script is being run to set up root password, it might happen that the mysql server doesn't get a change to evaluate the SQL statement sent by security_reset.expect before the hardcoded 10 seconds timeout is reached. Allow the timeout to be overriden via env variable DB_MAX_TIMEOUT, which is already used as a timeout variable in extend_start.sh Change-Id: If82c6daca82a48d899605829dc99cf4a352cddcd Closes-Bug: #1775864 (cherry picked from commit 8e2906a59e663d43aaac2369b5b74e5142b61d53) --- docker/mariadb/security_reset.expect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/security_reset.expect b/docker/mariadb/security_reset.expect index af71463fb8..6d2755e4d4 100644 --- a/docker/mariadb/security_reset.expect +++ b/docker/mariadb/security_reset.expect @@ -1,6 +1,6 @@ #!/usr/bin/expect -f -set timeout 10 +if [catch {set timeout $env(DB_MAX_TIMEOUT)}] {set timeout 10} spawn mysql_secure_installation expect { timeout { send_user "\nFailed to get 'Enter current password for root (enter for none):' prompt\n"; exit 1 }