Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pt-kill Added new features that can support tidb #876

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Update pt-kill Added new features that can support tidb #876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion bin/pt-kill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
# notices and disclaimers.

use DBI;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is auto-generated code. No change should be here.

I also do not understand why you need to explicitly import DBI for the code you propose.

use strict;
use warnings FATAL => 'all';

Expand Down Expand Up @@ -7131,12 +7132,18 @@ sub main {
my $kill; # callback to KILL
my $kill_sth;
my $kill_sql;
my $db_type = $o->get('db-type') ;

if ( $o->get('rds') ){
$kill_sql = $o->get('kill-query') ? 'CALL mysql.rds_kill_query(?)' : 'CALL mysql.rds_kill(?)';
}
else{
$kill_sql = $o->get('kill-query') ? 'KILL QUERY ?' : 'KILL ?';
}

if (defined $db_type && length $db_type > 0 && $db_type eq "tidb") {
$kill_sql = $o->get('kill-query') ? 'KILL QUERY ?' : 'KILL tidb ?';
}
my $files;
if ( $files = $o->get('test-matching') ) {
PTDEBUG && _d('Getting processlist from files:', @$files);
Expand Down Expand Up @@ -7232,7 +7239,19 @@ sub main {
return $retry->retry(
tries => 2,
try => sub {
return $kill_sth->execute($id);
eval {

$kill_sth->bind_param(1, $id, DBI::SQL_INTEGER);

};

if ($@) {

print $@."\n";

}
#return $kill_sth->execute($id);
return $kill_sth->execute();
},
fail => sub {
my (%args) = @_;
Expand Down Expand Up @@ -8011,6 +8030,11 @@ pt-kill does not provide any safeguards so code carefully!

It is permissible for the code to have side effects (to alter C<$event>).

=item --db-type

type: string

mysql; tidb
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here should be the default value for mysql. Please check other options where the default value is defined.


=item --group-by

Expand Down