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

Fix problem with detecting wheter im processes has shutdown cleanly

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-07-26 10:35:08 +02:00
parent 563a092f1f
commit 0d177b2d85
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3485,36 +3485,29 @@ sub im_stop($) {
} }
} }
# Check that all processes died. # Check if all processes shutdown cleanly
my $clean_shutdown= 1; # Assum they did
my $clean_shutdown= 0; if (kill (0, $instance_manager->{'pid'}))
while (1)
{ {
if (kill (0, $instance_manager->{'pid'})) mtr_warning("IM-main is still alive.");
{ $clean_shutdown= 0;
mtr_warning("IM-main is still alive."); }
last;
}
if (defined $instance_manager->{'angel_pid'} && if (defined $instance_manager->{'angel_pid'} &&
kill (0, $instance_manager->{'angel_pid'})) kill (0, $instance_manager->{'angel_pid'}))
{ {
mtr_warning("IM-angel is still alive."); mtr_warning("IM-angel is still alive.");
last; $clean_shutdown= 0;
} }
foreach my $pid (@mysqld_pids) foreach my $pid (@mysqld_pids)
{
if (kill (0, $pid))
{ {
if (kill (0, $pid)) mtr_warning("Guarded mysqld ($pid) is still alive.");
{ $clean_shutdown= 0;
mtr_warning("Guarded mysqld ($pid) is still alive.");
last;
}
} }
$clean_shutdown= 1;
last;
} }
# Kill leftovers (the order is important). # Kill leftovers (the order is important).