percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-21 18:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create percona_test.sentinel in start-sandbox so wait_for_slave() works for other sandboxes. skip_all for skip_innodb.t with 5.6 because of http://bugs.mysql.com/67798.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-04 00:14:20 +00:00
parent cb640e2cad
commit e7c3e908bb
6 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sandbox.pm
View File

@@ -335,11 +335,11 @@ sub wait_for_slaves {
my $master_dbh = $self->get_dbh_for($args{master} || 'master');
my $slave2_dbh = $self->get_dbh_for($args{slave} || 'slave2');
my ($ping) = $master_dbh->selectrow_array("SELECT MD5(RAND())");
$master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1");
$master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
PerconaTest::wait_until(
sub {
my ($pong) = $slave2_dbh->selectrow_array(
"SELECT ping FROM percona_test.sentinel WHERE id=1");
"SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_slaves */");
return $ping eq $pong;
}, undef, 300
);