diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-03-16 19:39:19 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-03-22 00:38:21 -0400 |
| commit | 52ce743bbf0264808d422c09638e13f2042fbf7e (patch) | |
| tree | 6bde74259b6a62f2319fe7b229fc804986a7f301 /debian/mariadb-server-10.1.mysql.init | |
| parent | df3ad1109765a4e207dede13769e993ab34903c5 (diff) | |
| download | mariadb-git-52ce743bbf0264808d422c09638e13f2042fbf7e.tar.gz | |
MDEV-9382: After updating mariadb server apt-configure fails
When acting as a Galera receiver node, server startup may take
more than 30 secs (the current default) as it has to wait for
SST/IST operation to complete besides spending some time doing
wsrep recovery.
Fixed by raising the default value of MYSQLD_STARTUP_TIMEOUT
to 60 secs. Also sourced /etc/default/mariadb into the init
script so that it can be used to set MYSQLD_STARTUP_TIMEOUT.
Diffstat (limited to 'debian/mariadb-server-10.1.mysql.init')
| -rw-r--r-- | debian/mariadb-server-10.1.mysql.init | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/mariadb-server-10.1.mysql.init b/debian/mariadb-server-10.1.mysql.init index 9e098b4d87c..91d07e8de3e 100644 --- a/debian/mariadb-server-10.1.mysql.init +++ b/debian/mariadb-server-10.1.mysql.init @@ -37,6 +37,9 @@ umask 077 # so break my scripts. export HOME=/etc/mysql/ +# Source default config file. +[ -r /etc/default/mariadb ] && . /etc/default/mariadb + ## Fetch a particular option from mysql's invocation. # # Usage: void mysqld_get_param option @@ -109,7 +112,7 @@ case "${1:-''}" in /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & # 6s was reported in #352070 to be too little - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do + for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-60}"); do sleep 1 if mysqld_status check_alive nowarn ; then break; fi log_progress_msg "." |