percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mke pt-online-schema-change/privs.t stable by waiting for drop user to replicate.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-05 15:53:43 -07:00
parent 909552bf40
commit 7f8d07a615
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
t/pt-online-schema-change/privs.t
View File

@@ -19,14 +19,18 @@ require "$trunk/bin/pt-online-schema-change";
my $dp = new DSNParser(opts=>$dsn_opts); my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master'); my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1'); my $slave1_dbh = $sb->get_dbh_for('slave1');
my $slave2_dbh = $sb->get_dbh_for('slave2');
if ( !$master_dbh ) { if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
elsif ( !$slave_dbh ) { elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave1'; plan skip_all => 'Cannot connect to sandbox slave1';
} }
elsif ( !$slave2_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave2';
}
elsif ( !@{$master_dbh->selectall_arrayref('show databases like "sakila"')} ) { elsif ( !@{$master_dbh->selectall_arrayref('show databases like "sakila"')} ) {
plan skip_all => 'sakila database is not loaded'; plan skip_all => 'sakila database is not loaded';
} }
@@ -48,10 +52,10 @@ my $sample = "t/pt-online-schema-change/samples/";
# https://bugs.launchpad.net/percona-toolkit/+bug/987694 # https://bugs.launchpad.net/percona-toolkit/+bug/987694
# ############################################################################ # ############################################################################
diag(`/tmp/12345/use -u root < $trunk/$sample/osc-user.sql`); diag(`/tmp/12345/use -u root < $trunk/$sample/osc-user.sql`);
PerconaTest::wait_for_table($slave_dbh, "mysql.tables_priv", "user='osc_user'"); PerconaTest::wait_for_table($slave1_dbh, "mysql.tables_priv", "user='osc_user'");
$sb->load_file('master', "$sample/basic_no_fks.sql"); $sb->load_file('master', "$sample/basic_no_fks.sql");
PerconaTest::wait_for_table($slave_dbh, "pt_osc.t", "id=20"); PerconaTest::wait_for_table($slave1_dbh, "pt_osc.t", "id=20");
$output = output( $output = output(
sub { $exit_status = pt_online_schema_change::main(@args, sub { $exit_status = pt_online_schema_change::main(@args,
@@ -78,6 +82,12 @@ like(
); );
diag(`/tmp/12345/use -u root -e "drop user 'osc_user'\@'%'"`); diag(`/tmp/12345/use -u root -e "drop user 'osc_user'\@'%'"`);
wait_until(
sub {
my $rows=$slave2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
return !grep { ($_->[0] || '') ne 'osc_user' } @$rows;
}
);
# ############################################################################# # #############################################################################
# Done. # Done.