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

Add verbose printouts for im_start and im_stop

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-07-18 14:53:50 +02:00
parent 6971ddee1a
commit da214608b4
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3417,8 +3417,9 @@ sub im_start($$) {
return;
}
$instance_manager->{'pid'} =
mtr_get_pid_from_file($instance_manager->{'path_pid'});
my $pid= mtr_get_pid_from_file($instance_manager->{'path_pid'});
$instance_manager->{'pid'} = $pid;
mtr_verbose("im_start: pid: $pid");
}
@ -3460,25 +3461,23 @@ sub im_stop($) {
# Try graceful shutdown.
mtr_debug("IM-main pid: $instance_manager->{'pid'}");
mtr_debug("Stopping IM-main...");
mtr_verbose("Stopping IM-main, pid: $instance_manager->{'pid'}");
mtr_kill_process($instance_manager->{'pid'}, 'TERM', 10);
# If necessary, wait for angel process to die.
if (defined $instance_manager->{'angel_pid'})
my $pid= $instance_manager->{'angel_pid'};
if (defined $pid)
{
mtr_debug("IM-angel pid: $instance_manager->{'angel_pid'}");
mtr_debug("Waiting for IM-angel to die...");
mtr_verbose("Waiting for IM-angel to die, pid: $pid");
my $total_attempts= 10;
for (my $cur_attempt=1; $cur_attempt <= $total_attempts; ++$cur_attempt)
{
unless (kill (0, $instance_manager->{'angel_pid'}))
unless (kill (0, $pid))
{
mtr_debug("IM-angel died.");
mtr_verbose("IM-angel died.");
last;
}
@ -3494,14 +3493,14 @@ sub im_stop($) {
{
if (kill (0, $instance_manager->{'pid'}))
{
mtr_debug("IM-main is still alive.");
mtr_warning("IM-main is still alive.");
last;
}
if (defined $instance_manager->{'angel_pid'} &&
kill (0, $instance_manager->{'angel_pid'}))
{
mtr_debug("IM-angel is still alive.");
mtr_warning("IM-angel is still alive.");
last;
}
@ -3509,7 +3508,7 @@ sub im_stop($) {
{
if (kill (0, $pid))
{
mtr_debug("Guarded mysqld ($pid) is still alive.");
mtr_warning("Guarded mysqld ($pid) is still alive.");
last;
}
}
@ -3525,18 +3524,18 @@ sub im_stop($) {
if (defined $instance_manager->{'angel_pid'})
{
mtr_debug("Killing IM-angel...");
mtr_verbose("Killing IM-angel, pid: $instance_manager->{'angel_pid'}");
mtr_kill_process($instance_manager->{'angel_pid'}, 'KILL', 10)
}
mtr_debug("Killing IM-main...");
mtr_verbose("Killing IM-main, pid: $instance_manager->{'pid'}");
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
# legally.
mtr_debug("Killing guarded mysqld(s)...");
mtr_verbose("Killing guarded mysqld(s) " . join(@mysqld_pids));
mtr_kill_processes(\@mysqld_pids);
# Complain in error log so that a warning will be shown.