percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-19 08:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed PerconaTest::{wait_until_no_lag|wait_until_slaves_running}, replaced them with Sandbox::wait_for_slaves

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-06-07 12:00:40 -03:00
parent dac0731251
commit 03a9461daf
3 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/PerconaTest.pm
View File

@@ -246,42 +246,6 @@ sub wait_until {
return 0;
}
sub wait_until_slave_running {
my (@dbhs) = @_;
foreach my $dbh (@dbhs) {
PTDEVDEBUG && _d('Waiting for slaves to be running');
wait_until(
sub {
my $row = $dbh->selectrow_hashref('SHOW SLAVE STATUS');
my $sqlt = $row->{slave_sql_running} || $row->{Slave_SQL_Running} || 'NULL';
my $iot = $row->{Slave_IO_Running} || $row->{slave_io_running} || 'NULL';
PTDEVDEBUG && _d('Slave SQL:', $sqlt, 'Slave IO:', $iot);
return $sqlt eq 'Yes' && $iot eq 'Yes';
}
);
}
}
sub wait_until_no_lag {
my (@dbhs) = @_;
foreach my $dbh (@dbhs) {
PTDEVDEBUG && _d('Waiting for no slave lag');
wait_until( # slaves aren't lagging
sub {
my $row = $dbh->selectrow_hashref('SHOW SLAVE STATUS');
my $lag = exists $row->{Seconds_Behind_Master}
? $row->{Seconds_Behind_Master}
: $row->{seconds_behind_master};
PTDEVDEBUG && _d('Slave lag:', $lag);
if ( !defined $lag ) {
BAIL_OUT("Slave is stopped: " . Dumper($row));
}
return $lag ? 0 : 1;
}
);
}
}
# Wait t seconds for code to return.
sub wait_for {
my ( $code, $t ) = @_;