1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280

Browse Source 
mysql-test/lib/mtr_process.pl:
  Exclude
mysql-test/mysql-test-run.pl:
  Exclude
This commit is contained in:
unknown 2007-03-30 16:43:15 +02:00
parent 62d3063dc1
commit a632339f48
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/lib/mtr_process.pl
View File

@ -562,7 +562,7 @@ sub mtr_check_stop_servers ($) {
# Return if no processes are defined # Return if no processes are defined
return if ! @$spec; return if ! @$spec;
mtr_verbose("mtr_check_stop_servers"); #mtr_report("mtr_check_stop_servers");
mtr_ping_with_timeout(\@$spec); mtr_ping_with_timeout(\@$spec);
@ -605,10 +605,7 @@ sub mtr_check_stop_servers ($) {
{ {
if ( $srv->{'pid'} ) if ( $srv->{'pid'} )
{ {
# Add the process pid to list of pids to kill $mysqld_pids{$srv->{'pid'}}= 1;
# if the process has a "real_pid" use it
$mysqld_pids{$srv->{'real_pid'} ?
$srv->{'real_pid'} : $srv->{'pid'}}= 1;
} }
else else
{ {
@ -641,9 +638,13 @@ sub mtr_check_stop_servers ($) {
# that for true Win32 processes, kill(0,$pid) will not return 1. # that for true Win32 processes, kill(0,$pid) will not return 1.
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
start_reap_all(); # Avoid zombies
my @mysqld_pids= keys %mysqld_pids; my @mysqld_pids= keys %mysqld_pids;
mtr_kill_processes(\@mysqld_pids); mtr_kill_processes(\@mysqld_pids);
stop_reap_all(); # Get into control again
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Now, we check if all we can find using kill(0,$pid) are dead, # Now, we check if all we can find using kill(0,$pid) are dead,
# and just assume the rest are. We cleanup socket and PID files. # and just assume the rest are. We cleanup socket and PID files.
@ -653,15 +654,14 @@ sub mtr_check_stop_servers ($) {
my $errors= 0; my $errors= 0;
foreach my $srv ( @$spec ) foreach my $srv ( @$spec )
{ {
my $pid= $srv->{'real_pid'} ? $srv->{'real_pid'} : $srv->{'pid'}; if ( $srv->{'pid'} )
if ( $pid )
{ {
if ( kill(0, $pid) ) if ( kill(0,$srv->{'pid'}) )
{ {
# FIXME In Cygwin there seem to be some fast reuse # FIXME In Cygwin there seem to be some fast reuse
# of PIDs, so dying may not be the right thing to do. # of PIDs, so dying may not be the right thing to do.
$errors++; $errors++;
mtr_warning("can't kill process $pid"); mtr_warning("can't kill process $srv->{'pid'}");
} }
else else
{ {
@ -682,8 +682,6 @@ sub mtr_check_stop_servers ($) {
mtr_warning("couldn't delete $file"); mtr_warning("couldn't delete $file");
} }
} }
# Reap the child
waitpid($srv->{'pid'},&WNOHANG);
$srv->{'pid'}= 0; $srv->{'pid'}= 0;
} }
} }
@ -1065,10 +1063,7 @@ sub sleep_until_file_created ($$$) {
{ {
if ( -r $pidfile ) if ( -r $pidfile )
{ {
# Read real pid from pidfile return $pid;
my $real_pid= mtr_fromfile($pidfile);
mtr_verbose("pid: $pid, real_pid: $real_pid");
return $real_pid;
} }
# Check if it died after the fork() was successful # Check if it died after the fork() was successful

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

@ -2549,16 +2549,10 @@ sub ndbcluster_wait_started($$){
sub mysqld_wait_started($){ sub mysqld_wait_started($){
my $mysqld= shift; my $mysqld= shift;
my $pid_from_pidfile= my $res= sleep_until_file_created($mysqld->{'path_pid'},
sleep_until_file_created($mysqld->{'path_pid'}, $mysqld->{'start_timeout'},
$mysqld->{'start_timeout'}, $mysqld->{'pid'});
$mysqld->{'pid'}); return $res == 0;
# On platforms with pseudo threads we need to save
# the real pid of mysqld read from pidfile
$mysqld->{'real_pid'}= $pid_from_pidfile;
return $pid_from_pidfile == 0;
} }
@ -4053,7 +4047,6 @@ sub stop_all_servers () {
push(@kill_pids,{ push(@kill_pids,{
pid => $mysqld->{'pid'}, pid => $mysqld->{'pid'},
real_pid => $mysqld->{'real_pid'},
pidfile => $mysqld->{'path_pid'}, pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'}, sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'}, port => $mysqld->{'port'},
@ -4260,7 +4253,6 @@ sub run_testcase_stop_servers($$$) {
push(@kill_pids,{ push(@kill_pids,{
pid => $mysqld->{'pid'}, pid => $mysqld->{'pid'},
real_pid => $mysqld->{'real_pid'},
pidfile => $mysqld->{'path_pid'}, pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'}, sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'}, port => $mysqld->{'port'},
@ -4311,7 +4303,6 @@ sub run_testcase_stop_servers($$$) {
push(@kill_pids,{ push(@kill_pids,{
pid => $mysqld->{'pid'}, pid => $mysqld->{'pid'},
real_pid => $mysqld->{'real_pid'},
pidfile => $mysqld->{'path_pid'}, pidfile => $mysqld->{'path_pid'},
sockfile => $mysqld->{'path_sock'}, sockfile => $mysqld->{'path_sock'},
port => $mysqld->{'port'}, port => $mysqld->{'port'},