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

MDEV-25802 mtr: race condition if the test quickly restarts twice

Browse Source 
part II

need to tell SafeProcess not to collect the exited mysqld
in sleep_until_file_created(), so that it would be found in the
later wait_any_timeout() in run_testcase()

Removed a strange condition in SafeProcess::wait_one()
that treated return value of -1 from waitpid() as "process exists"
instead of as "no such child process" (see `perldoc -f waitpid`)
This commit is contained in:
Sergei Golubchik
2021-07-06 11:36:59 +02:00
parent 1223cfe1d3
commit 621fae3cbc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ sub sleep_until_file_created ($$$$$) {
my $seconds= ($loop * $sleeptime) / 1000;
# Check if it died after the fork() was successful
if ( defined $proc and ! $proc->wait_one(0) )
if ( defined $proc and ! $proc->wait_one(0, 1) )
{
return 1 if -r $expectfile;
mtr_warning("Process $proc died after mysql-test-run waited $seconds " .