percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-24 02:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move retry_timeouts.t tests to error_handling.t and remove retry_timeouts.t. Change max_chunk value for checking slave diffs to avoid infinite wait for nonexistent chunks. Use undef instead of 0 for skipped chunks. Make lock wait timeout skipped++ instead of errors++.

Browse Source
This commit is contained in:
Daniel Nichter
2011-10-15 15:45:11 -06:00
parent 23e9b91d78
commit c28461aaef
3 changed files with 62 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
t/pt-table-checksum/error_handling.t
View File

@@ -23,7 +23,7 @@ if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
else {
plan tests => 2;
plan tests => 6;
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -59,6 +59,57 @@ is(
"Only one warning for MySQL error 1265"
);
# ############################################################################
# Lock wait timeout
# ############################################################################
$master_dbh->do('use sakila');
$master_dbh->do('begin');
$master_dbh->do('select * from city for update');
$output = output(
sub { pt_table_checksum::main(@args, qw(-t sakila.city)) },
stderr => 1,
trf => sub { return PerconaTest::normalize_checksum_results(@_) },
);
like(
$output,
qr/Lock wait timeout exceeded/,
"Catches lock wait timeout"
);
like(
$output,
qr/^0 0 0 1 1 sakila.city/m,
"Skips chunk that times out"
);
# Lock wait timeout for sandbox servers is 3s, so sleep 4 then commit
# to release the lock. That should allow the checksum query to finish.
my ($id) = $master_dbh->selectrow_array('select connection_id()');
system("sleep 4 ; /tmp/12345/use -e 'KILL $id' >/dev/null");
$output = output(
sub { pt_table_checksum::main(@args, qw(-t sakila.city)) },
stderr => 1,
trf => sub { return PerconaTest::normalize_checksum_results(@_) },
);
unlike(
$output,
qr/Lock wait timeout exceeded/,
"Lock wait timeout retried"
);
like(
$output,
qr/^0 0 600 1 0 sakila.city/m,
"Checksum retried after lock wait timeout"
);
# Reconnect to master since we just killed ourself.
$master_dbh = $sb->get_dbh_for('master');
# #############################################################################
# Done.
# #############################################################################