mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-02 02:34:19 +00:00
Add --run-time to pt-table-checksum. Remove NAME_lc arg from Cxn and turn it on by default like it used to be and fix pt-kill accordingly.
This commit is contained in:
Daniel Nichter
@@ -3810,7 +3810,7 @@ sub new {
|
||||
dsn_name => $dp->as_string($dsn, [qw(h P S)]),
|
||||
hostname => '',
|
||||
set => $args{set},
|
||||
NAME_lc => $args{NAME_lc},
|
||||
NAME_lc => defined $args{NAME_lc} ? $args{NAME_lc} : 1,
|
||||
dbh_set => 0,
|
||||
OptionParser => $o,
|
||||
DSNParser => $dp,
|
||||
@@ -3848,11 +3848,8 @@ sub set_dbh {
|
||||
|
||||
PTDEBUG && _d($dbh, 'Setting dbh');
|
||||
|
||||
if ( !exists $self->{NAME_lc}
|
||||
|| (defined $self->{NAME_lc} && $self->{NAME_lc}) ) {
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc';
|
||||
}
|
||||
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
|
||||
|
||||
my $sql = 'SELECT @@hostname, @@server_id';
|
||||
PTDEBUG && _d($dbh, $sql);
|
||||
my ($hostname, $server_id) = $dbh->selectrow_array($sql);
|
||||
|
||||
@@ -1451,6 +1451,7 @@ sub new {
|
||||
dsn_name => $dp->as_string($dsn, [qw(h P S)]),
|
||||
hostname => '',
|
||||
set => $args{set},
|
||||
NAME_lc => defined $args{NAME_lc} ? $args{NAME_lc} : 1,
|
||||
dbh_set => 0,
|
||||
OptionParser => $o,
|
||||
DSNParser => $dp,
|
||||
@@ -1488,8 +1489,8 @@ sub set_dbh {
|
||||
|
||||
PTDEBUG && _d($dbh, 'Setting dbh');
|
||||
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc';
|
||||
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
|
||||
|
||||
my $sql = 'SELECT @@hostname, @@server_id';
|
||||
PTDEBUG && _d($dbh, $sql);
|
||||
my ($hostname, $server_id) = $dbh->selectrow_array($sql);
|
||||
@@ -6242,6 +6243,134 @@ sub _d {
|
||||
# End IndexLength package
|
||||
# ###########################################################################
|
||||
|
||||
# ###########################################################################
|
||||
# Runtime package
|
||||
# This package is a copy without comments from the original. The original
|
||||
# with comments and its test file can be found in the Bazaar repository at,
|
||||
# lib/Runtime.pm
|
||||
# t/lib/Runtime.t
|
||||
# See https://launchpad.net/percona-toolkit for more information.
|
||||
# ###########################################################################
|
||||
{
|
||||
package Runtime;
|
||||
|
||||
use strict;
|
||||
use warnings FATAL => 'all';
|
||||
use English qw(-no_match_vars);
|
||||
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
|
||||
|
||||
sub new {
|
||||
my ( $class, %args ) = @_;
|
||||
my @required_args = qw(now);
|
||||
foreach my $arg ( @required_args ) {
|
||||
die "I need a $arg argument" unless $args{$arg};
|
||||
}
|
||||
|
||||
if ( ($args{runtime} || 0) < 0 ) {
|
||||
die "runtime argument must be greater than zero"
|
||||
}
|
||||
|
||||
my $self = {
|
||||
%args,
|
||||
start_time => undef,
|
||||
end_time => undef,
|
||||
time_left => undef,
|
||||
stop => 0,
|
||||
};
|
||||
|
||||
return bless $self, $class;
|
||||
}
|
||||
|
||||
sub time_left {
|
||||
my ( $self, %args ) = @_;
|
||||
|
||||
if ( $self->{stop} ) {
|
||||
PTDEBUG && _d("No time left because stop was called");
|
||||
return 0;
|
||||
}
|
||||
|
||||
my $now = $self->{now}->(%args);
|
||||
PTDEBUG && _d("Current time:", $now);
|
||||
|
||||
if ( !defined $self->{start_time} ) {
|
||||
$self->{start_time} = $now;
|
||||
}
|
||||
|
||||
return unless defined $now;
|
||||
|
||||
my $runtime = $self->{runtime};
|
||||
return unless defined $runtime;
|
||||
|
||||
if ( !$self->{end_time} ) {
|
||||
$self->{end_time} = $now + $runtime;
|
||||
PTDEBUG && _d("End time:", $self->{end_time});
|
||||
}
|
||||
|
||||
$self->{time_left} = $self->{end_time} - $now;
|
||||
PTDEBUG && _d("Time left:", $self->{time_left});
|
||||
return $self->{time_left};
|
||||
}
|
||||
|
||||
sub have_time {
|
||||
my ( $self, %args ) = @_;
|
||||
my $time_left = $self->time_left(%args);
|
||||
return 1 if !defined $time_left; # run forever
|
||||
return $time_left <= 0 ? 0 : 1; # <=0s means runtime has elapsed
|
||||
}
|
||||
|
||||
sub time_elapsed {
|
||||
my ( $self, %args ) = @_;
|
||||
|
||||
my $start_time = $self->{start_time};
|
||||
return 0 unless $start_time;
|
||||
|
||||
my $now = $self->{now}->(%args);
|
||||
PTDEBUG && _d("Current time:", $now);
|
||||
|
||||
my $time_elapsed = $now - $start_time;
|
||||
PTDEBUG && _d("Time elapsed:", $time_elapsed);
|
||||
if ( $time_elapsed < 0 ) {
|
||||
warn "Current time $now is earlier than start time $start_time";
|
||||
}
|
||||
return $time_elapsed;
|
||||
}
|
||||
|
||||
sub reset {
|
||||
my ( $self ) = @_;
|
||||
$self->{start_time} = undef;
|
||||
$self->{end_time} = undef;
|
||||
$self->{time_left} = undef;
|
||||
$self->{stop} = 0;
|
||||
PTDEBUG && _d("Reset runtime");
|
||||
return;
|
||||
}
|
||||
|
||||
sub stop {
|
||||
my ( $self ) = @_;
|
||||
$self->{stop} = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
sub start {
|
||||
my ( $self ) = @_;
|
||||
$self->{stop} = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
sub _d {
|
||||
my ($package, undef, $line) = caller 0;
|
||||
@_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
|
||||
map { defined $_ ? $_ : 'undef' }
|
||||
@_;
|
||||
print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
|
||||
}
|
||||
|
||||
1;
|
||||
}
|
||||
# ###########################################################################
|
||||
# End Runtime package
|
||||
# ###########################################################################
|
||||
|
||||
# ###########################################################################
|
||||
# This is a combination of modules and programs in one -- a runnable module.
|
||||
# http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
|
||||
@@ -6784,6 +6913,21 @@ 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.
|
||||
# ########################################################################
|
||||
@@ -7007,7 +7151,7 @@ sub main {
|
||||
# done in these callbacks. This callback is the only place where we
|
||||
# can prematurely stop nibbling by returning false. This allows
|
||||
# Ctrl-C to stop the tool between nibbles instead of between tables.
|
||||
return $oktorun; # continue nibbling table?
|
||||
return $oktorun && $have_time->(); # continue nibbling table?
|
||||
},
|
||||
exec_nibble => sub {
|
||||
my (%args) = @_;
|
||||
@@ -7245,7 +7389,7 @@ sub main {
|
||||
# ########################################################################
|
||||
|
||||
TABLE:
|
||||
while ( $oktorun && (my $tbl = $schema_iter->next()) ) {
|
||||
while ( $oktorun && $have_time->() && (my $tbl = $schema_iter->next()) ) {
|
||||
eval {
|
||||
# Results, stats, and info related to checksuming this table can
|
||||
# be saved here. print_checksum_results() uses this info.
|
||||
@@ -7352,7 +7496,9 @@ sub main {
|
||||
}
|
||||
}
|
||||
|
||||
PTDEBUG && _d('Exit status', $exit_status, 'oktorun', $oktorun);
|
||||
PTDEBUG && _d('Exit status', $exit_status,
|
||||
'oktorun', $oktorun,
|
||||
'have time', $have_time->());
|
||||
return $exit_status;
|
||||
}
|
||||
|
||||
@@ -8937,6 +9083,16 @@ type: int; default: 2
|
||||
Retry a chunk this many times when there is a nonfatal error. Nonfatal errors
|
||||
are problems such as a lock wait timeout or the query being killed.
|
||||
|
||||
=item --run-time
|
||||
|
||||
type: time
|
||||
|
||||
How long to run. Default is to run until all tables have been checksummed.
|
||||
These time value suffixes are allowed: s (seconds), m (minutes), h (hours),
|
||||
and d (days). Combine this option with L<"--resume"> to checksum as many
|
||||
tables within an allotted time, resuming from where the tool left off next
|
||||
time it is ran.
|
||||
|
||||
=item --separator
|
||||
|
||||
type: string; default: #
|
||||
|
||||
@@ -103,7 +103,7 @@ sub new {
|
||||
dsn_name => $dp->as_string($dsn, [qw(h P S)]),
|
||||
hostname => '',
|
||||
set => $args{set},
|
||||
NAME_lc => $args{NAME_lc},
|
||||
NAME_lc => defined $args{NAME_lc} ? $args{NAME_lc} : 1,
|
||||
dbh_set => 0,
|
||||
OptionParser => $o,
|
||||
DSNParser => $dp,
|
||||
@@ -150,11 +150,8 @@ sub set_dbh {
|
||||
PTDEBUG && _d($dbh, 'Setting dbh');
|
||||
|
||||
# Set stuff for this dbh (i.e. initialize it).
|
||||
if ( !exists $self->{NAME_lc}
|
||||
|| (defined $self->{NAME_lc} && $self->{NAME_lc}) ) {
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc';
|
||||
}
|
||||
|
||||
$dbh->{FetchHashKeyName} = 'NAME_lc' if $self->{NAME_lc};
|
||||
|
||||
# Update the cxn's name. Until we connect, the DSN parts
|
||||
# h and P are used. Once connected, use @@hostname.
|
||||
my $sql = 'SELECT @@hostname, @@server_id';
|
||||
|
||||
77
t/pt-table-checksum/run_time.t
Normal file
77
t/pt-table-checksum/run_time.t
Normal file
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
BEGIN {
|
||||
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
|
||||
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
|
||||
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
|
||||
};
|
||||
|
||||
use strict;
|
||||
use warnings FATAL => 'all';
|
||||
use English qw(-no_match_vars);
|
||||
use Test::More;
|
||||
use Time::HiRes qw(time);
|
||||
use Data::Dumper;
|
||||
$Data::Dumper::Indent = 1;
|
||||
$Data::Dumper::Sortkeys = 1;
|
||||
$Data::Dumper::Quotekeys = 0;
|
||||
|
||||
use PerconaTest;
|
||||
use Sandbox;
|
||||
shift @INC; # our unshift (above)
|
||||
shift @INC; # PerconaTest's unshift
|
||||
require "$trunk/bin/pt-table-checksum";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $master_dbh = $sb->get_dbh_for('master');
|
||||
|
||||
if ( !$master_dbh ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
}
|
||||
|
||||
# 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.
|
||||
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
|
||||
my @args = ($master_dsn, qw(--lock-wait-timeout 3), '--max-load', '');
|
||||
my $output;
|
||||
my $exit_status;
|
||||
|
||||
# On my 2.4 GHz with SSD this takes a little more than 3s,
|
||||
# so no test servers should be faster, hopefully.
|
||||
my $t0 = time;
|
||||
$exit_status = pt_table_checksum::main(@args,
|
||||
qw(--quiet --quiet -d sakila --chunk-size 100 --run-time 1));
|
||||
my $t = time - $t0;
|
||||
|
||||
ok(
|
||||
$t >= 1.5 && $t <= 2.0,
|
||||
"Run in roughly --run-time 1 second"
|
||||
) or diag("Actual run time: $t");
|
||||
|
||||
my $rows = $master_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by db, tbl");
|
||||
my $sakila_finished = grep { $_->[0] eq 'sakila.store' } @$rows;
|
||||
ok(
|
||||
!$sakila_finished,
|
||||
"Did not finish checksumming sakila"
|
||||
) or diag(Dumper($rows));
|
||||
|
||||
# Add --resume to complete the run.
|
||||
$exit_status = pt_table_checksum::main(@args,
|
||||
qw(--quiet --quiet -d sakila --chunk-size 100));
|
||||
|
||||
$rows = $master_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by db, tbl");
|
||||
$sakila_finished = grep { $_->[0] eq 'sakila.store' } @$rows;
|
||||
ok(
|
||||
$sakila_finished,
|
||||
"Resumed and finish checksumming sakila"
|
||||
) or diag(Dumper($rows));
|
||||
|
||||
# #############################################################################
|
||||
# Done.
|
||||
# #############################################################################
|
||||
$sb->wipe_clean($master_dbh);
|
||||
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
|
||||
done_testing;
|
||||
exit;
|
||||
Reference in New Issue
Block a user