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

PT-167 Still need to add tests

Browse Source 
Description here
This commit is contained in:
Carlos Salguero
2017-09-04 12:03:36 -03:00
parent 218bd2874b
commit 738f9809f8
5 changed files with 150 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
bin/pt-kill
View File

@@ -3297,6 +3297,17 @@ sub new {
foreach my $arg ( qw(MasterSlave) ) {
die "I need a $arg argument" unless $args{$arg};
}
my $kill_busy_commands = {};
if ($args{kill_busy_commands}) {
for my $command (split /,/,$args{kill_busy_commands}) {
$command =~ s/^\s+|\s+$//g;
$kill_busy_commands->{$command} = 1;
}
} else {
$kill_busy_commands->{Query} = 1;
}
$args{kill_busy_commands} = $kill_busy_commands;
my $self = {
%args,
polls => 0,
@@ -3523,7 +3534,7 @@ sub find {
next QUERY;
}
if ( $find_spec{busy_time} && ($query->{Command} || '') eq 'Query' ) {
if ( $find_spec{busy_time} && exists($self->{kill_busy_commands}->{$query->{Command} || ''}) ) {
next QUERY unless defined($query->{Time});
if ( $query->{Time} < $find_spec{busy_time} ) {
PTDEBUG && _d("Query isn't running long enough");
@@ -6788,7 +6799,7 @@ sub main {
DSNParser => $dp,
Quoter => "Quoter",
);
my $pl = new Processlist(MasterSlave => $ms);
my $pl = new Processlist(MasterSlave => $ms, kill_busy_commands => $o->get('kill-busy-commands'));
my $qr = new QueryRewriter();
my $cxn;
@@ -8198,6 +8209,21 @@ that pt-kill matched and killed a query.
See also L<"--wait-before-kill"> and L<"--wait-after-kill">.
=item --kill-busy-commands
default: Query
group: Actions
Comma sepatated list of commands that will be watched/killed if they ran for
more than L<"--busy-time"> seconds. Default: C<Query>
By default, L<"--busy-time"> kills only C<Query> commands but in some cases, it
is needed to make L<"--busy-time"> to watch and kill other commands. For example,
a prepared statement execution command is C<Execute> instead of C<Query>. In this
case, specifying C<--kill-busy-commands=Query,Execute> will also kill the prepared
stamente execution.
=item --kill-query
group: Actions

14
bin/pt-query-digest
View File

@@ -3251,6 +3251,17 @@ sub new {
foreach my $arg ( qw(MasterSlave) ) {
die "I need a $arg argument" unless $args{$arg};
}
my $kill_busy_commands = {};
if ($args{kill_busy_commands}) {
for my $command (split /,/,$args{kill_busy_commands}) {
$command =~ s/^\s+|\s+$//g;
$kill_busy_commands->{$command} = 1;
}
} else {
$kill_busy_commands->{Query} = 1;
}
$args{kill_busy_commands} = $kill_busy_commands;
my $self = {
%args,
polls => 0,
@@ -3465,6 +3476,7 @@ sub find {
my $ms = $self->{MasterSlave};
my @matches;
$self->{_reasons_for_matching} = undef;
QUERY:
foreach my $query ( @$proclist ) {
PTDEBUG && _d('Checking query', Dumper($query));
@@ -3476,7 +3488,7 @@ sub find {
next QUERY;
}
if ( $find_spec{busy_time} && ($query->{Command} || '') eq 'Query' ) {
if ( $find_spec{busy_time} && exists($self->{kill_busy_commands}->{$query->{Command} || ''}) ) {
next QUERY unless defined($query->{Time});
if ( $query->{Time} < $find_spec{busy_time} ) {
PTDEBUG && _d("Query isn't running long enough");