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

Merge pull request #665 from codership/10.2-fix-mtr-wait

Browse Source 
Fix mtr to be able to wait for >1 exited mysqld
This commit is contained in:
Jan Lindström
2018-04-16 14:19:09 +03:00
committed by GitHub
parent 47ea2227e5 72deed5988
commit 29d4ac2ceb
1 changed files with 129 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3961,32 +3961,32 @@ sub run_testcase ($$) {
} }
my $test= $tinfo->{suite}->start_test($tinfo); my $test= $tinfo->{suite}->start_test($tinfo);
# Set only when we have to keep waiting after expectedly died server # Set to a list of processes we have to keep waiting (expectedly died servers)
my $keep_waiting_proc = 0; my %keep_waiting_proc = ();
my $print_timeout= start_timer($print_freq * 60); my $print_timeout= start_timer($print_freq * 60);
while (1) while (1)
{ {
my $proc; my $proc;
if ($keep_waiting_proc) if (scalar(keys(%keep_waiting_proc)) > 0)
{ {
# Any other process exited? # Any other process exited?
$proc = My::SafeProcess->check_any(); $proc = My::SafeProcess->check_any();
if ($proc) if ($proc)
{ {
mtr_verbose ("Found exited process $proc"); mtr_verbose ("Found exited process $proc");
$keep_waiting_proc{$proc} = 1;
} }
else else
{ {
$proc = $keep_waiting_proc;
# Also check if timer has expired, if so cancel waiting # Also check if timer has expired, if so cancel waiting
if ( has_expired($test_timeout) ) if ( has_expired($test_timeout) )
{ {
$keep_waiting_proc = 0; %keep_waiting_proc = ();
} }
} }
} }
if (! $keep_waiting_proc) if (scalar(keys(%keep_waiting_proc)) == 0)
{ {
if($test_timeout > $print_timeout) if($test_timeout > $print_timeout)
{ {
@ -4003,137 +4003,148 @@ sub run_testcase ($$) {
else else
{ {
$proc= My::SafeProcess->wait_any_timeout($test_timeout); $proc= My::SafeProcess->wait_any_timeout($test_timeout);
$keep_waiting_proc{$proc} = 1;
} }
} }
# Will be restored if we need to keep waiting if (scalar(keys(%keep_waiting_proc)) == 0)
$keep_waiting_proc = 0;
unless ( defined $proc )
{ {
mtr_error("wait_any failed"); mtr_error("wait_any failed");
} }
mtr_verbose("Got $proc"); mtr_verbose("Got " . join(",", keys(%keep_waiting_proc)));
mark_time_used('test'); mark_time_used('test');
# ---------------------------------------------------- my $expected_exit = 1;
# Was it the test program that exited foreach $proc (keys(%keep_waiting_proc)) {
# ---------------------------------------------------- # ----------------------------------------------------
if ($proc eq $test) # Was it the test program that exited
{ # ----------------------------------------------------
my $res= $test->exit_status(); if ($proc eq $test)
if (($res == 0 or $res == 62) and $opt_warnings and check_warnings($tinfo) )
{ {
# If test case suceeded, but it has produced unexpected my $res= $test->exit_status();
# warnings, continue with $res == 1;
# but if the test was skipped, it should remain skipped
$res= 1 if $res == 0;
resfile_output($tinfo->{'warnings'}) if $opt_resfile;
}
if ( $res == 0 ) if (($res == 0 or $res == 62) and $opt_warnings and check_warnings($tinfo) )
{ {
my $check_res; # If test case suceeded, but it has produced unexpected
if ( $opt_check_testcases and # warnings, continue with $res == 1;
$check_res= check_testcase($tinfo, "after")) # but if the test was skipped, it should remain skipped
{ $res= 1 if $res == 0;
if ($check_res == 1) { resfile_output($tinfo->{'warnings'}) if $opt_resfile;
# Test case had sideeffects, not fatal error, just continue }
if ($opt_warnings) {
# Checking error logs for warnings, so need to stop server if ( $res == 0 )
# gracefully so that memory leaks etc. can be properly detected. {
stop_servers(reverse all_servers()); my $check_res;
check_warnings_post_shutdown($server_socket); if ( $opt_check_testcases and
# Even if we got warnings here, we should not fail this $check_res= check_testcase($tinfo, "after"))
# particular test, as the warnings may be caused by an earlier {
# test. if ($check_res == 1) {
} else { # Test case had sideeffects, not fatal error, just continue
# Not checking warnings, so can do a hard shutdown. if ($opt_warnings) {
stop_all_servers($opt_shutdown_timeout); # Checking error logs for warnings, so need to stop server
# gracefully so that memory leaks etc. can be properly detected.
stop_servers(reverse all_servers());
check_warnings_post_shutdown($server_socket);
# Even if we got warnings here, we should not fail this
# particular test, as the warnings may be caused by an earlier
# test.
} else {
# Not checking warnings, so can do a hard shutdown.
stop_all_servers($opt_shutdown_timeout);
}
mtr_report("Resuming tests...\n");
resfile_output($tinfo->{'check'}) if $opt_resfile;
} }
mtr_report("Resuming tests...\n"); else {
resfile_output($tinfo->{'check'}) if $opt_resfile; # Test case check failed fatally, probably a server crashed
} report_failure_and_restart($tinfo);
else { return 1;
# Test case check failed fatally, probably a server crashed }
report_failure_and_restart($tinfo); }
return 1; mtr_report_test_passed($tinfo);
} }
} elsif ( $res == 62 )
mtr_report_test_passed($tinfo); {
} # Testcase itself tell us to skip this one
elsif ( $res == 62 ) $tinfo->{skip_detected_by_test}= 1;
{ # Try to get reason from test log file
# Testcase itself tell us to skip this one find_testcase_skipped_reason($tinfo);
$tinfo->{skip_detected_by_test}= 1; mtr_report_test_skipped($tinfo);
# Try to get reason from test log file # Restart if skipped due to missing perl, it may have had side effects
find_testcase_skipped_reason($tinfo); if ( $tinfo->{'comment'} =~ /^perl not found/ )
mtr_report_test_skipped($tinfo); {
# Restart if skipped due to missing perl, it may have had side effects stop_all_servers($opt_shutdown_timeout);
if ( $tinfo->{'comment'} =~ /^perl not found/ ) }
{ }
stop_all_servers($opt_shutdown_timeout); elsif ( $res == 65 )
} {
} # Testprogram killed by signal
elsif ( $res == 65 ) $tinfo->{comment}=
{ "testprogram crashed(returned code $res)";
# Testprogram killed by signal report_failure_and_restart($tinfo);
$tinfo->{comment}= }
"testprogram crashed(returned code $res)"; elsif ( $res == 1 )
report_failure_and_restart($tinfo); {
} # Check if the test tool requests that
elsif ( $res == 1 ) # an analyze script should be run
{ my $analyze= find_analyze_request();
# Check if the test tool requests that if ($analyze){
# an analyze script should be run run_on_all($tinfo, "analyze-$analyze");
my $analyze= find_analyze_request(); }
if ($analyze){
run_on_all($tinfo, "analyze-$analyze");
}
# Wait a bit and see if a server died, if so report that instead # Wait a bit and see if a server died, if so report that instead
mtr_milli_sleep(100); mtr_milli_sleep(100);
my $srvproc= My::SafeProcess::check_any(); my $srvproc= My::SafeProcess::check_any();
if ($srvproc && grep($srvproc eq $_, started(all_servers()))) { if ($srvproc && grep($srvproc eq $_, started(all_servers()))) {
$proc= $srvproc; $proc= $srvproc;
goto SRVDIED; goto SRVDIED;
} }
# Test case failure reported by mysqltest
report_failure_and_restart($tinfo);
}
else
{
# mysqltest failed, probably crashed
$tinfo->{comment}=
"mysqltest failed with unexpected return code $res\n";
report_failure_and_restart($tinfo);
}
# Save info from this testcase run to mysqltest.log
if( -f $path_current_testlog)
{
if ($opt_resfile && $res && $res != 62) {
resfile_output_file($path_current_testlog);
}
mtr_appendfile_to_file($path_current_testlog, $path_testlog);
unlink($path_current_testlog);
}
return ($res == 62) ? 0 : $res;
# Test case failure reported by mysqltest
report_failure_and_restart($tinfo);
}
else
{
# mysqltest failed, probably crashed
$tinfo->{comment}=
"mysqltest failed with unexpected return code $res\n";
report_failure_and_restart($tinfo);
} }
# Save info from this testcase run to mysqltest.log # ----------------------------------------------------
if( -f $path_current_testlog) # Check if it was an expected crash
# ----------------------------------------------------
my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash == 0) # unexpected exit/crash of $proc
{ {
if ($opt_resfile && $res && $res != 62) { $expected_exit = 0;
resfile_output_file($path_current_testlog); last;
} }
mtr_appendfile_to_file($path_current_testlog, $path_testlog); elsif ($check_crash == 1) # $proc was started again by check_expected_crash_and_restart()
unlink($path_current_testlog); {
delete $keep_waiting_proc{$proc};
}
elsif ($check_crash == 2) # we must keep waiting
{
# do nothing
} }
return ($res == 62) ? 0 : $res;
} }
# ---------------------------------------------------- if ($expected_exit) {
# Check if it was an expected crash
# ----------------------------------------------------
my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash)
{
# Keep waiting if it returned 2, if 1 don't wait or stop waiting.
$keep_waiting_proc = 0 if $check_crash == 1;
$keep_waiting_proc = $proc if $check_crash == 2;
next; next;
} }