database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.

Browse Source 
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.


mysql-test/lib/mtr_process.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
mysql-test/mysql-test-run.pl:
  Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
This commit is contained in:
unknown
2006-06-11 11:28:11 +02:00
parent f2d51019e2
commit 312c46933a
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/mysql-test-run.pl
View File

@ -3407,7 +3407,7 @@ sub im_stop($) {
# Try graceful shutdown.
mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10, 1);
mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10);
# Check that all processes died.
@ -3433,10 +3433,10 @@ sub im_stop($) {
unless ($clean_shutdown)
{
mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10, 1)
mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10)
if defined $instance_manager->{'angel_pid'};
mtr_kill_process($instance_manager->{'pid'}, 'KILL', 10, 1);
mtr_kill_process($instance_manager->{'pid'}, 'KILL', 10);
# Shutdown managed mysqld-processes. Some of them may be nonguarded, so IM
# will not stop them on shutdown. So, we should firstly try to end them