database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-01 22:41:43 +03:00
Code

MCOL-1106 - increased mysqld startup timeouts

Browse Source
This commit is contained in:
david hill 2017-12-12 16:32:49 -06:00
parent 22d47cd00b
commit 44c06f2cc3
3 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/mysql/mysql-Columnstore
View File

@ -61,7 +61,7 @@ datadir=$basedir/db
# Value here is overriden by value in my.cnf. # Value here is overriden by value in my.cnf.
# 0 means don't wait at all # 0 means don't wait at all
# Negative numbers mean to wait indefinitely # Negative numbers mean to wait indefinitely
service_startup_timeout=30 service_startup_timeout=90
# Lock directory for RedHat / SuSE. # Lock directory for RedHat / SuSE.
lockdir='/var/lock/subsys' lockdir='/var/lock/subsys'
@ -262,6 +262,8 @@ wait_for_gone () {
done done
log_failure_msg log_failure_msg
kill_by_pid
return 1 return 1
} }
@ -310,7 +312,7 @@ fi
kill_by_pid() { kill_by_pid() {
# let's see if we can kill the 2 mysql procs by hand # let's see if we can kill the 2 mysql procs by hand
# get the our mysql from ps # get the our mysql from ps
eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql//bin/mysqld " | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}') eval $(ps -ef | grep "$COLUMNSTORE_INSTALL_DIR/mysql/bin/mysqld" | grep -v grep | head -1 | awk '{printf "pid=%d\n", $2}')
if [ -n "$pid" ]; then if [ -n "$pid" ]; then
ppid=$(ps -o ppid= -p $pid) ppid=$(ps -o ppid= -p $pid)
@ -369,6 +371,7 @@ case "$mode" in
wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$? wait_for_gone $mysqld_pid "$mysqld_pid_file_path"; return_value=$?
else else
log_failure_msg "MySQL server process #$mysqld_pid is not running!" log_failure_msg "MySQL server process #$mysqld_pid is not running!"
kill_by_pid
rm "$mysqld_pid_file_path" rm "$mysqld_pid_file_path"
fi fi

54
oam/install_scripts/binary_installer.sh
View File

@ -238,11 +238,15 @@ send_user "\n"
# #
# Start module installer to setup Customer OS files # Start module installer to setup Customer OS files
# #
if { $SERVERTYPE == "2" || $SERVERTYPE == "pmwithum" } {
set MODULETYPE "um"
}
send_user "Run Module Installer " send_user "Run Module Installer "
send " \n" send " \n"
send date\n send date\n
send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=$MODULETYPE --port=$MYSQLPORT --installdir=$INSTALLDIR'\n" send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=$MODULETYPE --port=$MYSQLPORT --installdir=$INSTALLDIR'\n"
set timeout 60 set timeout 120
expect { expect {
"word: " { send "$PASSWORD\n" "word: " { send "$PASSWORD\n"
exp_continue exp_continue
@ -256,54 +260,6 @@ expect {
} }
send_user "\n" send_user "\n"
if { $MODULETYPE == "um" || $SERVERTYPE == "2" || $SERVERTYPE == "pmwithum" } {
#
# run mysql setup scripts
#
send_user "Run MySQL Setup Scripts on Module "
send " \n"
send date\n
send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/post-mysqld-install --installdir=$INSTALLDIR'\n"
set timeout 60
expect {
"word: " { send "$PASSWORD\n"
exp_continue
}
"passphrase" { send "$PASSWORD\n"
exp_continue
}
"Exit status 0" { send_user "DONE" }
"Exit status 1" { send_user "ERROR: scp failed" ; exit 1 }
"ERROR" { send_user "ERROR: Daemon failed to run";
exit 1 }
"FAILED" { send_user "ERROR: Daemon failed to run";
exit 1 }
timeout { send_user "ERROR: Timeout\n" ; exit 2 }
}
send " \n"
send date\n
send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/post-mysql-install --installdir=$INSTALLDIR'\n"
set timeout 120
expect {
"word: " { send "$PASSWORD\n"
exp_continue
}
"passphrase" { send "$PASSWORD\n"
exp_continue
}
"Exit status 0" { send_user "DONE" }
"Exit status 1" { send_user "ERROR: scp failed" ; exit 1 }
"ERROR" { send_user "ERROR: Daemon failed to run";
exit 1 }
"FAILED" { send_user "ERROR: Daemon failed to run";
exit 1 }
timeout { send_user "ERROR: Timeout\n" ; exit 2 }
}
send_user "\n"
}
send_user "\nInstallation Successfully Completed on '$MODULE'\n" send_user "\nInstallation Successfully Completed on '$MODULE'\n"
exit 0 exit 0

2
oam/install_scripts/user_installer.sh
View File

@ -255,7 +255,7 @@ send_user "\n"
# #
send_user "Run Module Installer " send_user "Run Module Installer "
send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=um --port=$MYSQLPORT'\n" send "ssh -v $USERNAME@$SERVER '$INSTALLDIR/bin/module_installer.sh --module=um --port=$MYSQLPORT'\n"
set timeout 60 set timeout 120
expect { expect {
"word: " { send "$PASSWORD\n" "word: " { send "$PASSWORD\n"
exp_continue exp_continue