mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
0ff8d48661
can be started several times; monitor interval must be > 2sec
mysql-test/r/im_daemon_life_cycle.result:
Updated result file.
mysql-test/r/im_life_cycle.result:
Updated result file.
mysql-test/r/im_utils.result:
Updated result file.
mysql-test/t/im_daemon_life_cycle-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/im_daemon_life_cycle.imtest:
1. Use wait_for_start.sh script to minimize chance of race condition.
2. Polishing.
mysql-test/t/im_life_cycle.imtest:
1. Use wait_for_start.sh and wait_for_stop.sh scripts to
minimize chance of race condition;
2. Remove some statements, because there is no way now to
stabilize their output.
3. Polishing;
mysql-test/t/im_utils.imtest:
1. Use wait_for_start.sh script to minimize chance of race condition.
2. Polishing.
mysql-test/t/kill_n_check.sh:
1. Make timeout configurable by command-line argument;
2. Change algorithm of waiting for process to restart to be
more robust.
mysql-test/t/im_life_cycle-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/im_utils-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/wait_for_process.sh:
A new helper script, intended to be used instead of dummy "sleep"
when waiting for some process to start or stop.
115 lines
2.4 KiB
Bash
Executable file
115 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
###########################################################################
|
|
|
|
# NOTE: this script returns 0 (success) even in case of failure. This is
|
|
# because this script is executed under mysql-test-run[.pl] and it's better to
|
|
# examine particular problem in log file, than just having said that the test
|
|
# case has failed.
|
|
|
|
###########################################################################
|
|
|
|
check_restart()
|
|
{
|
|
if [ ! -r "$pid_path" ]; then
|
|
user_msg='the process was killed'
|
|
return 1
|
|
fi
|
|
|
|
new_pid=`cat "$pid_path" 2>/dev/null`
|
|
|
|
if [ $? -eq 0 -a "$original_pid" = "$new_pid" ]; then
|
|
user_msg='the process was not restarted'
|
|
return 1
|
|
fi
|
|
|
|
user_msg='the process was restarted'
|
|
return 0
|
|
}
|
|
|
|
###########################################################################
|
|
|
|
if [ $# -ne 3 ]; then
|
|
echo "Usage: kill_n_check.sh <pid file path> killed|restarted <timeout>"
|
|
exit 0
|
|
fi
|
|
|
|
pid_path="$1"
|
|
expected_result="$2"
|
|
total_timeout="$3"
|
|
|
|
if [ "$expected_result" != 'killed' -a \
|
|
"$expected_result" != 'restarted' ]; then
|
|
echo "Error: invalid second argument ('killed' or 'restarted' expected)."
|
|
exit 0
|
|
fi
|
|
|
|
if [ -z "$pid_path" ]; then
|
|
echo "Error: invalid PID path ($pid_path)."
|
|
exit 0
|
|
fi
|
|
|
|
if [ $expected_result = 'killed' -a ! -r "$pid_path" ]; then
|
|
echo "Error: PID file ($pid_path) does not exist."
|
|
exit 0
|
|
fi
|
|
|
|
if [ -z "$total_timeout" ]; then
|
|
echo "Error: timeout is not specified."
|
|
exit 0
|
|
fi
|
|
|
|
###########################################################################
|
|
|
|
original_pid=`cat "$pid_path"`
|
|
|
|
echo "Killing the process..."
|
|
|
|
kill -9 $original_pid
|
|
|
|
###########################################################################
|
|
|
|
echo "Sleeping..."
|
|
|
|
if [ "$expected_result" = "restarted" ]; then
|
|
|
|
# Wait for the process to restart.
|
|
|
|
cur_attempt=1
|
|
|
|
while true; do
|
|
|
|
if check_restart; then
|
|
echo "Success: $user_msg."
|
|
exit 0
|
|
fi
|
|
|
|
[ $cur_attempt -ge $total_timeout ] && break
|
|
|
|
sleep 1
|
|
|
|
cur_attempt=`expr $cur_attempt + 1`
|
|
|
|
done
|
|
|
|
echo "Error: $user_msg."
|
|
exit 0
|
|
|
|
else # $expected_result == killed
|
|
|
|
# Here we have to sleep for some long time to ensure that the process will
|
|
# not be restarted.
|
|
|
|
sleep $total_timeout
|
|
|
|
new_pid=`cat "$pid_path" 2>/dev/null`
|
|
|
|
if [ "$new_pid" -a "$new_pid" -ne "$original_pid" ]; then
|
|
echo "Error: the process was restarted."
|
|
else
|
|
echo "Success: the process was killed."
|
|
fi
|
|
|
|
exit 0
|
|
|
|
fi
|