percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-26 23:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify how ptc checks slave tables. Move that code from TableParser to pt_table_checksum::check_slave_tables. Change --[no]check-replicate-table-columns to --[no]check-slave-tables. Move tests to error_handling.t.

Browse Source
This commit is contained in:
Daniel Nichter
2012-11-02 15:22:47 -06:00
parent 22f20c524f
commit 0cffac95de
5 changed files with 273 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
t/lib/TableParser.t
View File

@@ -910,78 +910,9 @@ is_deeply(
'Index with comma in its name (issue 388)'
);
# #############################################################################
# pt-table-checksum doesn't check that tables exist on all replicas
# https://bugs.launchpad.net/percona-toolkit/+bug/1009510
# #############################################################################
my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1');
SKIP: {
skip "Cannot connect to sandbox master", 2 unless $master_dbh;
skip "Cannot connect to sandbox slave1", 2 unless $slave_dbh;
$master_dbh->do("DROP DATABASE IF EXISTS test");
$master_dbh->do("CREATE DATABASE test");
$sb->wait_for_slaves();
$slave_dbh->do("CREATE TABLE test.bug_1009510 ( i int, b int )");
$master_dbh->do("CREATE TABLE IF NOT EXISTS test.bug_1009510 ( i int )");
my $master_tbl = get_tbl_struct( $tp, $master_dbh, "test", "bug_1009510" );
$master_tbl->{db} = "test";
$master_tbl->{tbl} = "bug_1009510";
my $slave_tbl = get_tbl_struct( $tp, $slave_dbh, "test", "bug_1009510" );
my ($output) = full_output(sub {
$tp->check_table_against_slave(
tbl_name => "bug_1009510.test",
master_tbl => $master_tbl,
slave_tbl => $slave_tbl,
slave_name => 'slave1',
);
});
like(
$output,
qr/has more columns than its master: b/,
"check_table_against_slave warns about extra columns"
);
$slave_dbh->do("DROP TABLE test.bug_1009510");
$slave_dbh->do("CREATE TABLE test.bug_1009510 ( b int )");
$slave_tbl = get_tbl_struct( $tp, $slave_dbh, "test", "bug_1009510" );
local $EVAL_ERROR;
eval {
$tp->check_table_against_slave(
tbl_name => "bug_1009510.test",
master_tbl => $master_tbl,
slave_tbl => $slave_tbl,
slave_name => 'slave1',
);
};
like(
$EVAL_ERROR,
qr/differs from master: Columns i/,
"check_table_against_slave dies if the slave table has missing columns"
);
}
sub get_tbl_struct {
my ($tp, $dbh, $db, $tbl) = @_;
my $ddl = $tp->get_create_table( $dbh, $db, $tbl );
return $tp->parse( $ddl );
}
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh) if $dbh;
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;