Merge lp:~percona-toolkit-dev/percona-toolkit/pt-table-checksum-deadlock-1287253 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.10

[Frank Cizmich]

Simply adds "deadlock" to the set of errors that can be retried a few times if encountered

[Daniel Nichter (daniel-nichter)]

s/Deadlock found when trying to get lock/Deadlock found/ because matching error text is already a bad practice (we should match error codes) but we do it anyway, so is better to match minimal meaningful info in case the wording of the error in MySQL or DBD::mysql changes. Also, this makes it consistent with pt-osc.

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/pt-table-checksum-deadlock-1287253]

620. By Frank Cizmich on 2014-07-30

minimized error string match to favour compatibility

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2014-07-04 17:16:08 +0000
+++ bin/pt-table-checksum	2014-07-30 16:25:22 +0000
@@ -10561,6 +10561,7 @@
 
          if (   $error =~ m/Lock wait timeout exceeded/
              || $error =~ m/Query execution was interrupted/
+             || $error =~ m/Deadlock found/
          ) {
             # These errors/warnings can be retried, so don't print
             # a warning yet; do that in final_fail.
@@ -10584,8 +10585,9 @@
          my (%args) = @_;
          my $error = $args{error};
 
-         if (   $error =~ /Lock wait timeout exceeded/
-             || $error =~ /Query execution was interrupted/
+         if (   $error =~ m/Lock wait timeout exceeded/
+             || $error =~ m/Query execution was interrupted/
+             || $error =~ m/Deadlock found/
          ) {
             # These errors/warnings are not fatal but only cause this
             # nibble to be skipped.

=== modified file 't/pt-table-checksum/samples/default-results-5.5.txt'
--- t/pt-table-checksum/samples/default-results-5.5.txt	2013-02-19 01:51:14 +0000
+++ t/pt-table-checksum/samples/default-results-5.5.txt	2014-07-30 16:25:22 +0000
@@ -21,7 +21,7 @@
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
 0 0 2 0 mysql.user
-0 0 38 0 percona_test.checksums
+0 0 22 0 percona_test.checksums
 0 0 1 0 percona_test.load_data
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/default-results-5.6.txt'
--- t/pt-table-checksum/samples/default-results-5.6.txt	2013-02-19 01:51:44 +0000
+++ t/pt-table-checksum/samples/default-results-5.6.txt	2014-07-30 16:25:22 +0000
@@ -20,7 +20,7 @@
 0 0 0 0 mysql.time_zone_transition
 0 0 0 0 mysql.time_zone_transition_type
 0 0 2 0 mysql.user
-0 0 37 0 percona_test.checksums
+0 0 22 0 percona_test.checksums
 0 0 1 0 percona_test.load_data
 0 0 1 0 percona_test.sentinel
 0 0 200 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/static-chunk-size-results-5.5.txt'
--- t/pt-table-checksum/samples/static-chunk-size-results-5.5.txt	2013-02-19 01:51:14 +0000
+++ t/pt-table-checksum/samples/static-chunk-size-results-5.5.txt	2014-07-30 16:25:22 +0000
@@ -21,7 +21,7 @@
 0 0 0 1 0 mysql.time_zone_transition
 0 0 0 1 0 mysql.time_zone_transition_type
 0 0 2 1 0 mysql.user
-0 0 38 1 0 percona_test.checksums
+0 0 22 1 0 percona_test.checksums
 0 0 1 1 0 percona_test.load_data
 0 0 1 1 0 percona_test.sentinel
 0 0 200 1 0 sakila.actor

=== modified file 't/pt-table-checksum/samples/static-chunk-size-results-5.6.txt'
--- t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt	2013-02-19 01:51:44 +0000
+++ t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt	2014-07-30 16:25:22 +0000
@@ -20,7 +20,7 @@
 0 0 0 1 0 mysql.time_zone_transition
 0 0 0 1 0 mysql.time_zone_transition_type
 0 0 2 1 0 mysql.user
-0 0 37 1 0 percona_test.checksums
+0 0 22 1 0 percona_test.checksums
 0 0 1 1 0 percona_test.load_data
 0 0 1 1 0 percona_test.sentinel
 0 0 200 1 0 sakila.actor