mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
BUG #13625278 - PB2 SHOULD PROVIDE MORE USEFUL INFORMATION FOR TIMEOUTS
This commit is contained in:
@@ -3622,6 +3622,7 @@ sub run_testcase ($) {
|
|||||||
my $test= start_mysqltest($tinfo);
|
my $test= start_mysqltest($tinfo);
|
||||||
# Set only when we have to keep waiting after expectedly died server
|
# Set only when we have to keep waiting after expectedly died server
|
||||||
my $keep_waiting_proc = 0;
|
my $keep_waiting_proc = 0;
|
||||||
|
my $print_timeout= start_timer($print_freq * 60);
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
@@ -3645,9 +3646,24 @@ sub run_testcase ($) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (! $keep_waiting_proc)
|
if (! $keep_waiting_proc)
|
||||||
|
{
|
||||||
|
if($test_timeout > $print_timeout)
|
||||||
|
{
|
||||||
|
$proc= My::SafeProcess->wait_any_timeout($print_timeout);
|
||||||
|
if ( $proc->{timeout} )
|
||||||
|
{
|
||||||
|
#print out that the test is still on
|
||||||
|
mtr_print("Test still running: $tinfo->{name}");
|
||||||
|
#reset the timer
|
||||||
|
$print_timeout= start_timer($print_freq * 60);
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
$proc= My::SafeProcess->wait_any_timeout($test_timeout);
|
$proc= My::SafeProcess->wait_any_timeout($test_timeout);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# Will be restored if we need to keep waiting
|
# Will be restored if we need to keep waiting
|
||||||
$keep_waiting_proc = 0;
|
$keep_waiting_proc = 0;
|
||||||
|
Reference in New Issue
Block a user