Commit 9d69adc9 authored by Bjorn Munch's avatar Bjorn Munch

Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest

For some reason it usually picks up mysqltest
Wait .1s and then see if a server has died
Change from first commit: label on separate line
parent f57dda3b
...@@ -3495,6 +3495,14 @@ sub run_testcase ($) { ...@@ -3495,6 +3495,14 @@ sub run_testcase ($) {
run_on_all($tinfo, "analyze-$analyze"); run_on_all($tinfo, "analyze-$analyze");
} }
# Wait a bit and see if a server died, if so report that instead
mtr_milli_sleep(100);
my $srvproc= My::SafeProcess::check_any();
if ($srvproc && grep($srvproc eq $_, started(all_servers()))) {
$proc= $srvproc;
goto SRVDIED;
}
# Test case failure reported by mysqltest # Test case failure reported by mysqltest
report_failure_and_restart($tinfo); report_failure_and_restart($tinfo);
} }
...@@ -3520,6 +3528,7 @@ sub run_testcase ($) { ...@@ -3520,6 +3528,7 @@ sub run_testcase ($) {
# ---------------------------------------------------- # ----------------------------------------------------
# Check if it was an expected crash # Check if it was an expected crash
# ---------------------------------------------------- # ----------------------------------------------------
SRVDIED:
my $check_crash = check_expected_crash_and_restart($proc); my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash) if ($check_crash)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment