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

Wait for --replicate table to repl on all slaves. Add wait_for arg to PerconaTest::full_output().

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-05 12:29:26 -04:00
parent 95f7e53feb
commit 4f83cf4102
4 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
t/pt-table-checksum/progress.t
View File

@@ -39,10 +39,9 @@ elsif ( !$slave2_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave2';
}
else {
plan tests => 4;
plan tests => 5;
}
# 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.
# And --max-load "" prevents waiting for status variables. Setting
@@ -99,6 +98,40 @@ is(
# Now wait until the SQL thread is started again.
wait_until_slave_running($slave1_dbh, $slave2_dbh);
# #############################################################################
# Wait for --replicate table to replicate.
# https://bugs.launchpad.net/percona-toolkit/+bug/1008778
# #############################################################################
$master_dbh->do("DROP DATABASE IF EXISTS percona");
wait_until(sub {
my $dbs = $slave2_dbh->selectall_arrayref("SHOW DATABASES");
return !grep { $_->[0] eq 'percona' } @$dbs;
});
$sb->load_file('master', "t/pt-table-checksum/samples/dsn-table.sql");
$slave2_dbh->do("STOP SLAVE");
wait_until(sub {
my $ss = $slave2_dbh->selectrow_hashref("SHOW SLAVE STATUS");
return $ss->{slave_io_running} eq 'Yes';
});
($output) = PerconaTest::full_output(
sub { pt_table_checksum::main(@args, qw(-t sakila.country),
"--recursion-method", "dsn=F=/tmp/12345/my.sandbox.cnf,t=dsns.dsns");
},
wait_for => 3, # wait this many seconds then kill that ^
);
like(
$output,
qr/Waiting for the --replicate table to replicate to h=127.1,P=12347/,
"--progress for --replicate table (bug 1008778)"
);
$slave2_dbh->do("START SLAVE");
wait_until_slave_running($slave2_dbh);
# #############################################################################
# Done.
# #############################################################################

15
t/pt-table-checksum/samples/dsn-table.sql Normal file
View File

@@ -0,0 +1,15 @@
DROP DATABASE IF EXISTS dsns;
CREATE DATABASE dsns;
USE dsns;
CREATE TABLE dsns (
id int auto_increment primary key,
parent_id int default null,
dsn varchar(255) not null
);
INSERT INTO dsns VALUES
-- (1, null, 'h=127.1,P=12345,u=msandbox,p=msandbox'), -- master
(2, 1, 'h=127.1,P=12346,u=msandbox,p=msandbox'),
(3, 2, 'h=127.1,P=12347,u=msandbox,p=msandbox');