percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-21 19:34:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test that pt-kill reconnects using new util/kill-mysql-process. Fix optional DSN by adding magical options rule.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-12 16:49:15 -06:00
parent dab2e5c692
commit b1c6bba43a
4 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bin/pt-kill
View File

@@ -4086,6 +4086,7 @@ sub main {
eval {
$dbh = $cxn->connect();
$proc_sth = $dbh->prepare('SHOW FULL PROCESSLIST');
msg('Reconnected to ' . $cxn->name());
};
return 1 unless $EVAL_ERROR; # try again
}
@@ -4102,6 +4103,7 @@ sub main {
my $kill_sth = $dbh->prepare($kill_sql);
$kill = sub {
my ($id) = @_;
PTDEBUG && _d('Killing process', $id);
return $retry->retry(
try => sub {
return $kill_sth->execute($id);
@@ -4116,6 +4118,7 @@ sub main {
eval {
$dbh = $cxn->connect();
$kill_sth = $dbh->prepare($kill_sql);
msg('Reconnected to ' . $cxn->name());
};
return 1 unless $EVAL_ERROR; # try again
}
@@ -4371,16 +4374,6 @@ sub main {
# Subroutines.
# ############################################################################
sub get_cxn {
my ( $dp, $dsn, $ac ) = @_;
if ( $o->get('ask-pass') ) {
$dsn->{p} = OptionParser::prompt_noecho("Enter password: ");
}
my $dbh = $dp->get_dbh($dp->get_cxn_params($dsn), {AutoCommit => $ac});
$dbh->{InactiveDestroy} = 1; # Because of forking.
return $dbh;
}
# Forks and detaches from parent to execute the given command;
# does not block parent.
sub exec_cmd {
@@ -4604,6 +4597,9 @@ L<"--kill"> and L<"--kill-query"> are mutually exclusive.
L<"--daemonize"> and L<"--test-matching"> are mutually exclusive.
This tool accepts additional command-line arguments. Refer to the
L<"SYNOPSIS"> and usage information for details.
=over
=item --ask-pass
@@ -4626,6 +4622,12 @@ type: Array
Read this comma-separated list of config files; if specified, this must be the
first option on the command line.
=item --database
short form: -D; type: string
The database to use for the connection.
=item --daemonize
Fork to the background and detach from the shell. POSIX operating systems