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 new style Retry in CopyRowsInsertSelect.pm.

Browse Source
This commit is contained in:
Daniel Nichter
2011-11-02 10:05:48 -06:00
parent 348fe17038
commit 2e72da5717
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/CopyRowsInsertSelect.pm
View File

@@ -85,24 +85,23 @@ sub copy {
wait => sub { sleep 1; }, wait => sub { sleep 1; },
tries => 3, tries => 3,
try => sub { try => sub {
my ( %args ) = @_; $dbh->do($sql);
eval { return;
$dbh->do($sql); },
}; fail => sub {
if ( $EVAL_ERROR ) { my (%args) = @_;
MKDEBUG && _d($EVAL_ERROR); my $error = $args{error};
if ( $EVAL_ERROR =~ m/Lock wait timeout exceeded/ ) { MKDEBUG && _d($error);
$error = $EVAL_ERROR; if ( $error =~ m/Lock wait timeout exceeded/ ) {
if ( $args{tryno} > 1 ) { $msg->("Lock wait timeout exceeded; retrying $sql");
$msg->("Lock wait timeout exceeded; retrying $sql"); return 1; # call wait, call try
} }
return; return 0; # call final_fail
} },
die $EVAL_ERROR; final_fail => sub {
} my (%args) = @_;
return 1; die $args{error};
}, },
on_failure => sub { die $error; },
); );
} }