percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-05-02 01:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix-run-time-bug-1043438.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-12 10:27:47 -06:00
parent 5581dd8383 5a3c9aa7d4
commit 4ac74fbdbd
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-table-checksum
+19 -17
View File
@@ -8526,6 +8526,23 @@ sub main {
my $master_dbh = $master_cxn->dbh(); # just for brevity
my $master_dsn = $master_cxn->dsn(); # just for brevity
# ########################################################################
# Set up the run time, if any. Anything that waits should check this
# between waits, else this will happen:
# https://bugs.launchpad.net/percona-toolkit/+bug/1043438
# ########################################################################
my $have_time;
if ( my $run_time = $o->get('run-time') ) {
my $rt = Runtime->new(
now => sub { return time; },
runtime => $run_time,
);
$have_time = sub { return $rt->have_time(); };
}
else {
$have_time = sub { return 1; };
}
# ########################################################################
# If this is not a dry run (--explain was not specified), then we're
# going to checksum the tables, so do the necessary preparations and
@@ -8725,7 +8742,7 @@ sub main {
$replica_lag = new ReplicaLagWaiter(
slaves => $slave_lag_cxns,
max_lag => $o->get('max-lag'),
oktorun => sub { return $oktorun },
oktorun => sub { return $oktorun && $have_time->(); },
get_lag => $get_lag,
sleep => $sleep,
);
@@ -8748,7 +8765,7 @@ sub main {
$sys_load = new MySQLStatusWaiter(
max_spec => $o->get('max-load'),
get_status => $get_status,
oktorun => sub { return $oktorun },
oktorun => sub { return $oktorun && $have_time->(); },
sleep => $sleep,
);
};
@@ -8838,21 +8855,6 @@ sub main {
$last_chunk = undef;
}
# ########################################################################
# Set up the run time, if any.
# ########################################################################
my $have_time;
if ( my $run_time = $o->get('run-time') ) {
my $rt = Runtime->new(
now => sub { return time; },
runtime => $run_time,
);
$have_time = sub { return $rt->have_time(); };
}
else {
$have_time = sub { return 1; };
}
# ########################################################################
# Various variables and modules for checksumming the tables.
# ########################################################################