Skip to content

M
mariadb
Commit b8e9a612 authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files
Options

to make sure we get the kill right on the different platforms

parent 08b25e99
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
mysql-test/ndb/ndbcluster.sh
View file @ b8e9a612
...@@ -257,9 +257,13 @@ if [ -f "$fs_ndb/$pidfile" ] ; then ...@@ -257,9 +257,13 @@ if [ -f "$fs_ndb/$pidfile" ] ; then
attempt=`expr $attempt + 1` attempt=`expr $attempt + 1`
done done
if [ "$kill_pids2" != "" ] ; then if [ "$kill_pids2" != "" ] ; then
do_command="kill -9 $kill_pids2" echo "Failed to shutdown ndbcluster, executing kill "$kill_pids2
echo "Failed to shutdown ndbcluster, executing "$do_command kill -9 -- $kill_pids2 2> /dev/null
$do_command /bin/kill -9 -- $kill_pids2 2> /dev/null
/usr/bin/kill -9 -- $kill_pids2 2> /dev/null
kill -9 $kill_pids2 2> /dev/null
/bin/kill -9 $kill_pids2 2> /dev/null
/usr/bin/kill -9 $kill_pids2 2> /dev/null
fi fi
rm "$fs_ndb/$pidfile" rm "$fs_ndb/$pidfile"
fi fi
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7