percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 02:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ~percona-toolkit-dev/percona-toolkit/fix-ptc-checksum-tbl-bug-1008778.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-05 13:08:21 -04:00
parent 5c23b95072 bb2fd381d3
commit b96e43419f
5 changed files with 136 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/PerconaTest.pm
View File

@@ -743,7 +743,7 @@ sub _d {
# This is because otherwise, errors thrown during cleanup
# would be skipped.
sub full_output {
my ( $code ) = @_;
my ( $code, %args ) = @_;
die "I need a code argument" unless $code;
my (undef, $file) = tempfile();
@@ -756,6 +756,19 @@ sub full_output {
my $status;
warn $file;
if (my $pid = fork) {
if ( my $t = $args{wait_for} ) {
# Wait for t seconds then kill the child.
sleep $t;
my $tries = 3;
# Most tools require 2 interrupts to make them stop.
while ( kill(0, $pid) && $tries-- ) {
kill SIGTERM, $pid;
sleep 0.10;
}
# Child didn't respond to SIGTERM? Then kill -9 it.
kill SIGKILL, $pid if kill(0, $pid);
sleep 0.25;
}
waitpid($pid, 0);
$status = $?;
}