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

Add Cxn::lost_connection(). Rename runtime to run_time in Runtime.pm.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-25 11:52:22 -07:00
parent 8e449a1c83
commit c3740b7aac
2 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Cxn.pm
View File

@@ -173,6 +173,15 @@ sub set_dbh {
return $dbh;
}
sub lost_connection {
my ($self, $e) = @_;
return 0 unless $e;
return $e =~ m/MySQL server has gone away/
|| $e =~ m/Lost connection to MySQL server/;
# The 1st pattern means that MySQL itself died or was stopped.
# The 2nd pattern means that our cxn was killed (KILL <id>).
}
# Sub: dbh
# Return the cxn's dbh.
sub dbh {

41
lib/Runtime.pm
View File

@@ -18,13 +18,6 @@
# Runtime package
# ###########################################################################
{
# Package: Runtime
# Runtime keeps track of time to control how long a tool's main loop runs.
# This package was created to handle mk-query-digest --run-time-mode event.
# In essence, we abstract time so that the tool doesn't know/care whether
# now() comes from a clock, a log timestamp, or wherever. The creator of
# Runtime object determines how, or from where, time is gotten so that the
# caller of the object can simply ask, "What time is it?".
package Runtime;
use strict;
@@ -32,30 +25,24 @@ use warnings FATAL => 'all';
use English qw(-no_match_vars);
use constant PTDEBUG => $ENV{PTDEBUG} || 0;
# Sub: new
#
# Parameters:
# %args - Arguments
#
# Required Arguments:
# now - Callback that sets current time.
# runtime - Amount of time to run in seconds, or undef for forever.
#
# Returns:
# Runtime object
sub new {
my ( $class, %args ) = @_;
my @required_args = qw(now);
my @required_args = qw(run_time now);
foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless $args{$arg};
die "I need a $arg argument" unless exists $args{$arg};
}
if ( ($args{runtime} || 0) < 0 ) {
die "runtime argument must be greater than zero"
my $run_time = $args{run_time};
if ( defined $run_time ) {
die "run_time must be > 0" if $run_time <= 0;
}
my $now = $args{now};
die "now must be a callback" unless ref $now eq 'CODE';
my $self = {
%args,
run_time => $run_time,
now => $now,
start_time => undef,
end_time => undef,
time_left => undef,
@@ -99,14 +86,14 @@ sub time_left {
# we know the current time.
return unless defined $now;
# If runtime is also defined, then we can determine time left.
# If run_time is also defined, then we can determine time left.
# If it's not defined, then we're running forever.
my $runtime = $self->{runtime};
return unless defined $runtime;
my $run_time = $self->{run_time};
return unless defined $run_time;
# Set the end time once.
if ( !$self->{end_time} ) {
$self->{end_time} = $now + $runtime;
$self->{end_time} = $now + $run_time;
PTDEBUG && _d("End time:", $self->{end_time});
}