percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail if /tmp/port/stop doesn't exist when stopping test env.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-19 12:40:51 -06:00
parent 785de0cf57
commit efb6a0f6ce
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/jenkins-test
View File

@@ -63,7 +63,7 @@ export PATH="$PATH:/usr/sbin:$MYSQL_BASE_DIR/bin"
############################# #############################
sandbox/test-env checkconfig || exit 1 sandbox/test-env checkconfig || exit 1
sandbox/test-env stop || exit 1 sandbox/test-env stop || exit 1
sandbox/test-env kill sandbox/test-env kill || exit 1
sandbox/test-env start || exit 1 sandbox/test-env start || exit 1
####################### #######################

7
sandbox/stop-sandbox
View File

@@ -17,8 +17,11 @@ for port in "$@"; do
continue continue
fi fi
/tmp/$port/stop if [ -x "/tmp/$port/stop" ]; then
exit_status=$((exit_status | $?)) /tmp/$port/stop
exit_status=$((exit_status | $?))
fi
rm -rf /tmp/$port rm -rf /tmp/$port
exit_status=$((exit_status | $?)) exit_status=$((exit_status | $?))
done done

12
sandbox/test-env
View File

@@ -184,7 +184,6 @@ sandbox_is_running() {
kill_sandbox() { kill_sandbox() {
local p=$1 local p=$1
local rmdir=1
# See if the sandbox server is running. # See if the sandbox server is running.
sandbox_is_running $p sandbox_is_running $p
@@ -194,7 +193,7 @@ kill_sandbox() {
mysqladmin -h127.1 -P$p -umsandbox -pmsandbox shutdown >/dev/null 2>&1 mysqladmin -h127.1 -P$p -umsandbox -pmsandbox shutdown >/dev/null 2>&1
mysqladmin -h127.1 -P$p -uroot -pmsandbox shutdown >/dev/null 2>&1 mysqladmin -h127.1 -P$p -uroot -pmsandbox shutdown >/dev/null 2>&1
mysqladmin -h127.1 -P$p -uroot shutdown >/dev/null 2>&1 mysqladmin -h127.1 -P$p -uroot shutdown >/dev/null 2>&1
sleep 1 sleep 2
# See if the sandbox server is still running. # See if the sandbox server is still running.
sandbox_is_running $p sandbox_is_running $p
@@ -204,13 +203,13 @@ kill_sandbox() {
pid2=`ps xw | grep -v grep | grep -v mysqld_safe | grep mysqld | grep /tmp/$p | awk '{print $1}'` pid2=`ps xw | grep -v grep | grep -v mysqld_safe | grep mysqld | grep /tmp/$p | awk '{print $1}'`
[ "$pid1" ] && kill -9 $pid1 # Die, damn you, die! [ "$pid1" ] && kill -9 $pid1 # Die, damn you, die!
[ "$pid2" ] && kill -9 $pid2 [ "$pid2" ] && kill -9 $pid2
sleep 1 sleep 2
# Third and finaly check if the sandbox server is running. # Third and finaly check if the sandbox server is running.
sandbox_is_running $p sandbox_is_running $p
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
err "Failed to kill MySQL test server on port $p (PID $pid1, $pid2)" err "Failed to kill MySQL test server on port $p (PID $pid1, $pid2)"
rmdir=0 return 1
else else
echo "Killed MySQL test server on port $p (PID $pid1, $pid2)" echo "Killed MySQL test server on port $p (PID $pid1, $pid2)"
fi fi
@@ -219,12 +218,12 @@ kill_sandbox() {
fi fi
fi fi
if [ $rmdir -eq 1 ] && [ -d "/tmp/$p" ]; then if [ -d "/tmp/$p" ]; then
rm -rf /tmp/$p rm -rf /tmp/$p
echo "Removed /tmp/$p" echo "Removed /tmp/$p"
fi fi
return return 0
} }
MYSQL_VERSION="" MYSQL_VERSION=""
@@ -327,6 +326,7 @@ case $opt in
# when a polite stop fails. It uses kill -9 as a last resort. # when a polite stop fails. It uses kill -9 as a last resort.
for port in 12349 12348 12347 12346 12345 2903 2902 2901 2900; do for port in 12349 12348 12347 12346 12345 2903 2902 2901 2900; do
kill_sandbox $port kill_sandbox $port
exit_status=$((exit_status | $?))
done done
;; ;;
restart) restart)