Don't crash on empty tables with --chunk-size-limit=0. Don't crash trying to print MySQL warning. Finish updating (all the important) tests.

This commit is contained in:
Daniel Nichter
2011-10-15 17:47:56 -06:00
parent c28461aaef
commit 07420ff78e
8 changed files with 138 additions and 300 deletions

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More;
use Test::More skip_all => 'Finish updating issue_982.t';
use PerconaTest;
use Sandbox;
@@ -18,45 +18,36 @@ require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1');
my $slave1_dbh = $sb->get_dbh_for('slave1');
if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
if ( !$slave_dbh ) {
if ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave';
}
else {
plan tests => 8;
}
my $rows;
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --lock-wait-timeout=3 else the tool will die.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = ($master_dsn, qw(--lock-wait-timeout 3));
my $row;
my $output;
my $cnf = '/tmp/12345/my.sandbox.cnf';
$sb->create_dbs($master_dbh, [qw(test)]);
$sb->load_file('master', 't/pt-table-checksum/samples/checksum_tbl.sql');
# Normally checksum tbl is InnoDB but mk-table-checksum commits a txn
# for each chunk which is really slow. Using MyISAM takes a minute off
# the runtime of this test.
$master_dbh->do("alter table test.checksum engine=myisam");
# #############################################################################
# Issue 982: --empty-replicate-table does not work with binlog-ignore-db
# #############################################################################
$master_dbh->do("insert into test.checksum (db,tbl,chunk) values ('db','tbl',0)");
sleep 1;
$rows = $slave_dbh->selectall_arrayref('select * from test.checksum');
is(
scalar @$rows,
1,
"Slave checksum table has row"
);
$sb->wipe_clean($master_dbh);
pt_table_checksum::main(@args, qw(-t sakila.country --quiet));
$master_dbh->do("insert into percona.checksums values ('sakila', 'country', 99, null, null, null, null, '', 0, '', 0, null)");
PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', "db='sakila' and tbl='country' and chunk=99");
$master_dbh->disconnect();
$slave_dbh->disconnect();
$slave1_dbh->disconnect();
# Add a replication filter to the slave.
diag(`/tmp/12346/stop >/dev/null`);
@@ -68,32 +59,31 @@ diag(`/tmp/12345/start >/dev/null`);
diag(`/tmp/12346/start >/dev/null`);
$output = output(
sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
qw(--replicate=test.checksum -d mysql -t user --empty-replicate-table))
},
sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
qw(-d mysql -t user)) },
stderr => 1,
);
$master_dbh = $sb->get_dbh_for('master');
$slave_dbh = $sb->get_dbh_for('slave1');
$slave1_dbh = $sb->get_dbh_for('slave1');
$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='db'");
$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='country' and chunk=99");
ok(
@$rows == 0,
@$row == 0,
"Slave checksum table deleted"
);
# Clear checksum table for next tests.
$master_dbh->do("truncate table test.checksum");
sleep 1;
$rows = $slave_dbh->selectall_arrayref("select * from test.checksum");
ok(
!@$rows,
"Checksum table empty on slave"
$master_dbh->do("truncate table percona.checksums");
wait_until(
sub {
$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums");
return !@$row;
}
);
$master_dbh->disconnect();
$slave_dbh->disconnect();
$slave1_dbh->disconnect();
# Restore original config.
diag(`/tmp/12346/stop >/dev/null`);
@@ -111,11 +101,11 @@ diag(`/tmp/12345/start >/dev/null`);
diag(`/tmp/12346/start >/dev/null`);
$master_dbh = $sb->get_dbh_for('master');
$slave_dbh = $sb->get_dbh_for('slave1');
$slave1_dbh = $sb->get_dbh_for('slave1');
$output = output(
sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
qw(--replicate=test.checksum -d mysql -t user))
sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
qw(--replicate=percona.checksums -d mysql -t user))
},
stderr => 1,
);
@@ -124,34 +114,34 @@ $output = output(
# have done USE mysql before updating the checksum table. Thus, the
# checksums should show up on the slave.
sleep 1;
$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='mysql' AND tbl='user'");
$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
ok(
@$rows == 1,
@$row == 1,
"Checksum replicated with binlog-do-db, without --replicate-database"
);
# Now force --replicate-database test and the checksums should not replicate.
$master_dbh->do("use mysql");
$master_dbh->do("truncate table test.checksum");
$master_dbh->do("truncate table percona.checksums");
sleep 1;
$rows = $slave_dbh->selectall_arrayref("select * from test.checksum");
$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums");
ok(
!@$rows,
!@$row,
"Checksum table empty on slave"
);
$output = output(
sub { pt_table_checksum::main("F=$cnf", qw(--no-check-replication-filters),
qw(--replicate=test.checksum -d mysql -t user),
sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
qw(--replicate=percona.checksums -d mysql -t user),
qw(--replicate-database test))
},
stderr => 1,
);
sleep 1;
$rows = $slave_dbh->selectall_arrayref("select * from test.checksum where db='mysql' AND tbl='user'");
$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
ok(
!@$rows,
!@$row,
"Checksum did not replicated with binlog-do-db, with --replicate-database"
);
@@ -159,7 +149,7 @@ ok(
# Restore original config.
# #############################################################################
$master_dbh->disconnect();
$slave_dbh->disconnect();
$slave1_dbh->disconnect();
diag(`/tmp/12346/stop >/dev/null`);
diag(`/tmp/12345/stop >/dev/null`);
@@ -168,7 +158,7 @@ diag(`/tmp/12345/start >/dev/null`);
diag(`/tmp/12346/start >/dev/null`);
$master_dbh = $sb->get_dbh_for('master');
$slave_dbh = $sb->get_dbh_for('slave1');
$slave1_dbh = $sb->get_dbh_for('slave1');
# #############################################################################
# Test it again by looking at binlog to see that the db didn't change.
@@ -181,15 +171,15 @@ sleep 1;
my $it = "payment,rental,help_topic,help_keyword,inventory,film_actor";
$output = output(
sub { pt_table_checksum::main("F=$cnf",
qw(--replicate=test.checksum), '--ignore-tables', $it, qw(--chunk-size 20k))
sub { pt_table_checksum::main(@args,
qw(--replicate=percona.checksums), '--ignore-tables', $it, qw(--chunk-size 20k))
},
stderr => 1,
);
sleep 1;
my $row = $master_dbh->selectrow_hashref('show master status');
$output = `mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning' | sort -u`;
$row = $master_dbh->selectrow_hashref('show master status');
$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning' | sort -u`;
is(
$output,
"use mysql/*!*/;
@@ -203,15 +193,15 @@ diag(`$trunk/sandbox/test-env reset`);
sleep 1;
$output = output(
sub { pt_table_checksum::main("F=$cnf", qw(--replicate-database test),
qw(--replicate=test.checksum), '--ignore-tables', $it, qw(--chunk-size 20k))
sub { pt_table_checksum::main(@args, qw(--replicate-database test),
qw(--replicate=percona.checksums), '--ignore-tables', $it, qw(--chunk-size 20k))
},
stderr => 1,
);
sleep 1;
$row = $master_dbh->selectrow_hashref('show master status');
$output = `mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning'`;
$output = `$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog /tmp/12345/data/$row->{file} | grep 'use ' | grep -v '^# Warning'`;
is(
$output,
"use test/*!*/;