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

Merged simplify-pqd

Browse Source
This commit is contained in:
Brian Fraser
2013-01-31 14:52:34 -03:00
parent 3dc0b19f7e 5fd8042e35
commit efc89a6725
155 changed files with 3349 additions and 3899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/pt-table-usage
View File

@@ -5345,7 +5345,7 @@ sub new {
}
my $self = {
instrument => 0,
instrument => PTDEBUG,
continue_on_error => 0,
%args,
@@ -5372,9 +5372,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 };
}
@@ -5443,7 +5441,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) "
@@ -5455,9 +5457,6 @@ sub execute {
. "($name) caused too many errors.\n";
}
}
elsif ( !$self->{continue_on_error} ) {
die $msg;
}
else {
warn $msg;
}