percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use get_cmd_pid() again to avoid race condition.

Browse Source
This commit is contained in:
Daniel Nichter
2013-08-10 19:09:31 -07:00
parent 3c45ce2eb3
commit 299a61417a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
t/lib/Daemon.t
View File

@@ -184,12 +184,13 @@ SKIP: {
# pid-file is still running # pid-file is still running
# ########################################################################## # ##########################################################################
rm_tmp_files(); rm_tmp_files();
system("$cmd 5 --daemonize --pid $pid_file >/dev/null 2>&1"); system("$cmd 7 --daemonize --pid $pid_file >/dev/null 2>&1");
PerconaTest::wait_for_files($pid_file); PerconaTest::wait_for_files($pid_file);
chomp($pid = slurp_file($pid_file)); $pid = PerconaTest::get_cmd_pid("$cmd 7")
or die "Cannot get PID of $cmd 7";
kill 9, $pid; kill 9, $pid;
sleep 0.25; sleep 0.25;
(undef, $output) = PerconaTest::get_cmd_pid("$cmd 5"); (undef, $output) = PerconaTest::get_cmd_pid("$cmd 7");
unlike( unlike(
$output, $output,
qr/daemonize/, qr/daemonize/,
@@ -202,10 +203,10 @@ ok(
my (undef, $tempfile) = tempfile(); my (undef, $tempfile) = tempfile();
system("$cmd 5 --daemonize --log $log_file --pid $pid_file > $tempfile 2>&1"); system("$cmd 6 --daemonize --log $log_file --pid $pid_file > $tempfile 2>&1");
PerconaTest::wait_for_files($log_file, $pid_file, $tempfile); PerconaTest::wait_for_files($log_file, $pid_file, $tempfile);
my $new_pid; my $new_pid;
($new_pid, $output) = PerconaTest::get_cmd_pid("$cmd 5"); ($new_pid, $output) = PerconaTest::get_cmd_pid("$cmd 6");
like( like(
$output, $output,
@@ -219,8 +220,10 @@ like(
'Says that old PID is not running (issue 419)' 'Says that old PID is not running (issue 419)'
); );
ok( cmp_ok(
$pid != $new_pid, $pid,
'!=',
$new_pid,
'Overwrites PID file with new PID (issue 419)' 'Overwrites PID file with new PID (issue 419)'
); );