percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use get_cmd_pid() instead of slurping pid file because there's a race condition in pid file creation for which pid it contains (parent's or child's).

Browse Source
This commit is contained in:
Daniel Nichter
2013-08-10 19:02:32 -07:00
parent 5239779066
commit 3c45ce2eb3
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/lib/Daemon.t
View File

@@ -139,16 +139,14 @@ SKIP: {
skip 'No /proc', 1 unless -d '/proc'; skip 'No /proc', 1 unless -d '/proc';
skip 'No fd in /proc', 1 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0"; skip 'No fd in /proc', 1 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0";
system("$cmd 10 --daemonize --pid $pid_file --log $log_file"); system("$cmd 5 --daemonize --pid $pid_file --log $log_file");
PerconaTest::wait_for_files($pid_file) PerconaTest::wait_for_files($pid_file)
or die "$cmd did not create $pid_file"; or die "$cmd did not create $pid_file";
chomp($pid = slurp_file($pid_file)); my $pid = PerconaTest::get_cmd_pid("$cmd 5")
die "$pid_file is empty" unless $pid; or die "Cannot get PID of $cmd 5";
my $proc_fd_0 = -l "/proc/$pid/0" ? "/proc/$pid/0" my $proc_fd_0 = -l "/proc/$pid/0" ? "/proc/$pid/0"
: -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0" : -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0"
: die "Cannot find fd 0 symlink in /proc/$pid: " : die "Cannot find fd 0 symlink in /proc/$pid";
. `ls -l /proc/$pid/`
. `ps wx | grep 'daemonizes.pl'`;
PTDEVDEBUG && PerconaTest::_d('pid_file', $pid_file, PTDEVDEBUG && PerconaTest::_d('pid_file', $pid_file,
'pid', $pid, 'proc_fd_0', $proc_fd_0, `ls -l $proc_fd_0`); 'pid', $pid, 'proc_fd_0', $proc_fd_0, `ls -l $proc_fd_0`);
my $stdin = readlink $proc_fd_0; my $stdin = readlink $proc_fd_0;
@@ -238,10 +236,10 @@ diag(`rm $tempfile >/dev/null`);
# Check that it actually checks the running process. # Check that it actually checks the running process.
# ############################################################################ # ############################################################################
rm_tmp_files(); rm_tmp_files();
system("$cmd 20 --daemonize --log $log_file --pid $pid_file"); system("$cmd 10 --daemonize --log $log_file --pid $pid_file");
PerconaTest::wait_for_files($pid_file, $log_file); PerconaTest::wait_for_files($pid_file, $log_file);
chomp($pid = slurp_file($pid_file)); chomp($pid = slurp_file($pid_file));
$output = `$cmd 0 --daemonize --pid $pid_file 2>&1`; $output = `$cmd 1 --daemonize --pid $pid_file 2>&1`;
like( like(
$output, $output,
qr/PID file $pid_file exists and PID $pid is running/, qr/PID file $pid_file exists and PID $pid is running/,