diff options
| author | Damien Ciabrini <dciabrin@redhat.com> | 2018-10-24 13:27:23 +0200 |
|---|---|---|
| committer | Damien Ciabrini <dciabrin@redhat.com> | 2018-10-24 13:55:15 +0200 |
| commit | 8e2906a59e663d43aaac2369b5b74e5142b61d53 (patch) | |
| tree | 5fb02b325215e61e10df6622924c2b55c08c431f /docker | |
| parent | f613ff8a548accee65bd86209e4683539b66ffdb (diff) | |
| download | kolla-8e2906a59e663d43aaac2369b5b74e5142b61d53.tar.gz kolla-8e2906a59e663d43aaac2369b5b74e5142b61d53.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/security_reset.expect | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/mariadb/security_reset.expect b/docker/mariadb/security_reset.expect index af71463fb..6d2755e4d 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 } |