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

Merge simplify-pqd r542.

Browse Source
This commit is contained in:
Daniel Nichter
2013-01-18 18:29:38 -07:00
parent fcb5a0c0f8 06ce6e012e
commit 47f09d427a
4 changed files with 118 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Pipeline.pm
View File

@@ -71,9 +71,7 @@ sub add {
push @{$self->{procs}}, $process;
push @{$self->{names}}, $name;
if ( my $n = $args{retry_on_error} ) {
$self->{retries}->{$name} = $n;
}
$self->{retries}->{$name} = $args{retry_on_error} || 100;
if ( $self->{instrument} ) {
$self->{instrumentation}->{$name} = { time => 0, calls => 0 };
}
@@ -163,7 +161,11 @@ sub execute {
my $msg = "Pipeline process " . ($procno + 1)
. " ($name) caused an error: "
. $EVAL_ERROR;
if ( defined $self->{retries}->{$name} ) {
if ( !$self->{continue_on_error} ) {
die $msg . "Terminating pipeline because --continue-on-error "
. "is false.\n";
}
elsif ( defined $self->{retries}->{$name} ) {
my $n = $self->{retries}->{$name};
if ( $n ) {
warn $msg . "Will retry pipeline process $procno ($name) "
@@ -175,9 +177,6 @@ sub execute {
. "($name) caused too many errors.\n";
}
}
elsif ( !$self->{continue_on_error} ) {
die $msg;
}
else {
warn $msg;
}