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

Allow initial values to be zero for ReplicaLagLimiter::new(). Return 1/0/death from ReplicaLagLimiter::wait().

Browse Source
This commit is contained in:
Daniel Nichter
2011-09-20 11:28:00 -06:00
parent be9337a202
commit 412e9e4e18
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ReplicaLagLimiter.pm
View File

@@ -57,7 +57,7 @@ sub new {
my ( $class, %args ) = @_;
my @required_args = qw(spec slaves get_lag initial_n initial_t target_t);
foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless $args{$arg};
die "I need a $arg argument" unless defined $args{$arg};
}
my ($spec) = @args{@required_args};
@@ -146,7 +146,7 @@ sub update {
# Progress - <Progress> object to report waiting
#
# Returns:
# True if all slaves catch up before timeout, else die unless continue is true
# 1 if all slaves catch up before timeout, else 0 if continue=yes, else die.
sub wait {
my ( $self, %args ) = @_;
my @required_args = qw();
@@ -196,13 +196,19 @@ sub wait {
$slave = $slaves->[++$slave_no];
}
}
if ( $slave_no < @$slaves && $self->{continue} eq 'no' ) {
die "Timeout waiting for replica " . $slaves->[$slave_no]->{dsn}->{n}
. " to catch up\n";
if ( $slave_no < @$slaves ) {
if ( $self->{continue} eq 'no' ) {
die "Timeout waiting for replica " . $slaves->[$slave_no]->{dsn}->{n}
. " to catch up\n";
}
else {
MKDEBUG && _d('Some slave are not caught up');
return 0; # not ready
}
}
MKDEBUG && _d('All slaves caught up');
return 1;
return 1; # ready
}
sub _d {