Commit 52ce743b authored by Nirbhay Choubey's avatar Nirbhay Choubey

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.
parent df3ad110
...@@ -37,6 +37,9 @@ umask 077 ...@@ -37,6 +37,9 @@ umask 077
# so break my scripts. # so break my scripts.
export HOME=/etc/mysql/ export HOME=/etc/mysql/
# Source default config file.
[ -r /etc/default/mariadb ] && . /etc/default/mariadb
## Fetch a particular option from mysql's invocation. ## Fetch a particular option from mysql's invocation.
# #
# Usage: void mysqld_get_param option # Usage: void mysqld_get_param option
...@@ -109,7 +112,7 @@ case "${1:-''}" in ...@@ -109,7 +112,7 @@ case "${1:-''}" in
/usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 & /usr/bin/mysqld_safe "${@:2}" > /dev/null 2>&1 &
# 6s was reported in #352070 to be too little # 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 sleep 1
if mysqld_status check_alive nowarn ; then break; fi if mysqld_status check_alive nowarn ; then break; fi
log_progress_msg "." log_progress_msg "."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment