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

Add --test-matching to replace testing via STDIN/ARGV.

Browse Source
This commit is contained in:
Daniel Nichter
2012-01-25 11:37:10 -07:00
parent 0a81ddeaad
commit dd44a9b851
6 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bin/pt-kill
View File

@@ -3458,14 +3458,9 @@ sub main {
unless $o->got('interval'); unless $o->got('interval');
} }
if ( !-t STDIN ) {
PTDEBUG && _d("STDIN is piped");
@ARGV = ('-');
}
# Disable opts that don't make sense when reading proclist # Disable opts that don't make sense when reading proclist
# from a file (or STDIN). # from a file (or STDIN).
if ( @ARGV ) { if ( $o->get('test-matching') ) {
$o->set('run-time', 0); $o->set('run-time', 0);
$o->set('interval', 0); $o->set('interval', 0);
$o->set('ignore-self', 0); $o->set('ignore-self', 0);
@@ -3502,13 +3497,14 @@ sub main {
my $dbh; my $dbh;
my $kill_sth; my $kill_sth;
my $get_proclist; my $get_proclist;
if ( @ARGV ) { my $files;
PTDEBUG && _d('Getting processlist from files:', @ARGV); if ( $files = $o->get('test-matching') ) {
PTDEBUG && _d('Getting processlist from files:', @$files);
my $trp = new TextResultSetParser(); my $trp = new TextResultSetParser();
my $fh; my $fh;
$get_proclist = sub { $get_proclist = sub {
if ( !$fh ) { if ( !$fh ) {
my $file = shift @ARGV; my $file = shift @$files;
die 'No more files' unless $file; die 'No more files' unless $file;
if ( $file eq '-' ) { if ( $file eq '-' ) {
$fh = *STDIN; $fh = *STDIN;
@@ -3570,7 +3566,7 @@ sub main {
# ######################################################################## # ########################################################################
msg("$PROGRAM_NAME starting"); msg("$PROGRAM_NAME starting");
msg($dbh ? "Connected to host " . $dp->as_string($dsn) msg($dbh ? "Connected to host " . $dp->as_string($dsn)
: "Reading files @ARGV"); : "Test matching files @$files");
# Class-based match criteria. # Class-based match criteria.
my $query_count = $o->get('query-count'); my $query_count = $o->get('query-count');
@@ -3874,7 +3870,7 @@ pt-kill - Kill MySQL queries that match certain criteria.
=head1 SYNOPSIS =head1 SYNOPSIS
Usage: pt-kill [OPTION]... [FILE...] Usage: pt-kill [OPTIONS]
pt-kill kills MySQL connections. pt-kill connects to MySQL and gets queries pt-kill kills MySQL connections. pt-kill connects to MySQL and gets queries
from SHOW PROCESSLIST if no FILE is given. Else, it reads queries from one from SHOW PROCESSLIST if no FILE is given. Else, it reads queries from one
@@ -3899,7 +3895,8 @@ Print all login processes:
See which queries in the processlist right now would match: See which queries in the processlist right now would match:
mysql -e "SHOW PROCESSLIST" | pt-kill --busy-time 60 --print mysql -e "SHOW PROCESSLIST" > proclist.txt
pt-kill --test-matching proclist.txt --busy-time 60 --print
=head1 RISKS =head1 RISKS
@@ -4012,8 +4009,7 @@ L<"--any-busy-time"> and L<"--each-busy-time"> are mutually exclusive.
L<"--kill"> and L<"--kill-query"> are mutually exclusive. L<"--kill"> and L<"--kill-query"> are mutually exclusive.
This tool accepts additional command-line arguments. Refer to the L<"--daemonize"> and L<"--test-matching"> are mutually exclusive.
L<"SYNOPSIS"> and usage information for details.
=over =over
@@ -4418,6 +4414,17 @@ By default, matches do not apply to replication threads; i.e. replication
threads are completely ignored. Specifying this option allows matches to threads are completely ignored. Specifying this option allows matches to
match (and potentially kill) replication threads on masters and slaves. match (and potentially kill) replication threads on masters and slaves.
=item --test-matching
type: array; group: Query Matches
Files with processlist snapshots to test matching options against. Since
the matching options can be complex, you can save snapshots of processlist
in files, then test matching options against queries in those files.
This option disables L<"--run-time">, L<"--interval">,
and L<"--[no]ignore-self">.
=back =back
=head2 CLASS MATCHES =head2 CLASS MATCHES

12
t/pt-kill/basics.t
View File

@@ -23,7 +23,7 @@ if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
my $output; my $output;
@@ -72,16 +72,6 @@ like(
'--verbose' '--verbose'
); );
# ############################################################################
# Reading file (or STDIN) should require connection.
# ############################################################################
$output = `/tmp/12345/use -e "SHOW PROCESSLIST" | $trunk/bin/pt-kill -F $cnf --busy-time 1 --print --verbose`;
like(
$output,
qr/Reading files -/,
"Read STDIN from pipe"
);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################

2
t/pt-kill/execute_command.t
View File

@@ -29,7 +29,7 @@ my $out = "/tmp/mk-kill-test.txt";
# ############################################################################# # #############################################################################
diag(`rm $out 2>/dev/null`); diag(`rm $out 2>/dev/null`);
$output = `$cmd $trunk/t/lib/samples/pl/recset001.txt --match-command Query --execute-command 'echo hello > $out'`; $output = `$cmd --test-matching $trunk/t/lib/samples/pl/recset001.txt --match-command Query --execute-command 'echo hello > $out'`;
is( is(
$output, $output,
'', '',

17
t/pt-kill/group_by.t
View File

@@ -16,6 +16,7 @@ use Sandbox;
require "$trunk/bin/pt-kill"; require "$trunk/bin/pt-kill";
my $sample = "$trunk/t/lib/samples/pl/"; my $sample = "$trunk/t/lib/samples/pl/";
my @args = qw(--test-matching);
my $output; my $output;
# ############################################################################# # #############################################################################
@@ -25,7 +26,7 @@ my $output;
# The 3rd query (id 4) is user=root. Next we'll test that we can filter # The 3rd query (id 4) is user=root. Next we'll test that we can filter
# that one out. # that one out.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --each-busy-time 2 --match-all), qw(--group-by info --query-count 2 --each-busy-time 2 --match-all),
qw(--victims all-but-oldest --print)); } qw(--victims all-but-oldest --print)); }
); );
@@ -37,7 +38,7 @@ like(
# Now with --match-user user1, the 3rd query is not matched. # Now with --match-user user1, the 3rd query is not matched.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --each-busy-time 2 --match-user user1), qw(--group-by info --query-count 2 --each-busy-time 2 --match-user user1),
qw(--victims all-but-oldest --print)); } qw(--victims all-but-oldest --print)); }
); );
@@ -52,7 +53,7 @@ like(
# 9, but the 10 does. This is correct (see issue 1221) because --victims # 9, but the 10 does. This is correct (see issue 1221) because --victims
# is applied *after* per-class query matching. # is applied *after* per-class query matching.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --any-busy-time 10 --match-user user1), qw(--group-by info --query-count 2 --any-busy-time 10 --match-user user1),
qw(--victims oldest --print)); } qw(--victims oldest --print)); }
); );
@@ -63,7 +64,7 @@ is(
); );
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --any-busy-time 9 --match-user user1), qw(--group-by info --query-count 2 --any-busy-time 9 --match-user user1),
qw(--victims oldest --print)); } qw(--victims oldest --print)); }
); );
@@ -75,7 +76,7 @@ like(
# Nothing matches because --each-busy-time isn't satifised. # Nothing matches because --each-busy-time isn't satifised.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --each-busy-time 10 --match-user user1), qw(--group-by info --query-count 2 --each-busy-time 10 --match-user user1),
qw(--victims all-but-oldest --print)); } qw(--victims all-but-oldest --print)); }
); );
@@ -87,7 +88,7 @@ is(
# Each busy time matches on the lowest possible value. # Each busy time matches on the lowest possible value.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --each-busy-time 8 --match-user user1), qw(--group-by info --query-count 2 --each-busy-time 8 --match-user user1),
qw(--victims all-but-oldest --print)); } qw(--victims all-but-oldest --print)); }
); );
@@ -99,7 +100,7 @@ like(
# Nothing matches because --query-count isn't satisified. # Nothing matches because --query-count isn't satisified.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 4 --each-busy-time 1 --match-user user1), qw(--group-by info --query-count 4 --each-busy-time 1 --match-user user1),
qw(--victims all-but-oldest --print)); } qw(--victims all-but-oldest --print)); }
); );
@@ -111,7 +112,7 @@ is(
# Without stripping comments, the queries won't be grouped into a class. # Without stripping comments, the queries won't be grouped into a class.
$output = output( $output = output(
sub { pt_kill::main("$sample/recset010.txt", qw(--print), sub { pt_kill::main(@args, "$sample/recset010.txt",
qw(--group-by info --query-count 2 --each-busy-time 2 --match-user user1), qw(--group-by info --query-count 2 --each-busy-time 2 --match-user user1),
qw(--victims all-but-oldest --print --no-strip-comments)); } qw(--victims all-but-oldest --print --no-strip-comments)); }
); );

25
t/pt-kill/match.t
View File

@@ -18,13 +18,14 @@ my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $slave_dbh = $sb->get_dbh_for('slave1'); my $slave_dbh = $sb->get_dbh_for('slave1');
my @args = qw(--test-matching);
my $output; my $output;
# ############################################################################# # #############################################################################
# Test match commands. # Test match commands.
# ############################################################################# # #############################################################################
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset001.txt", qw(--match-info show --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset001.txt", qw(--match-info show --print)); }
); );
like( like(
$output, $output,
@@ -33,7 +34,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset002.txt", qw(--match-command Query --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset002.txt", qw(--match-command Query --print)); }
); );
is( is(
$output, $output,
@@ -42,7 +43,7 @@ is(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset002.txt", qw(--match-command Query --ignore-state), "''", "--print"); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset002.txt", qw(--match-command Query --ignore-state), "''", "--print"); }
); );
like( like(
$output, $output,
@@ -51,7 +52,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset003.txt", "--match-state", "Sorting result", "--print"); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset003.txt", "--match-state", "Sorting result", "--print"); }
); );
like( like(
$output, $output,
@@ -60,7 +61,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset003.txt", qw(--match-state Updating --print --victims all)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset003.txt", qw(--match-state Updating --print --victims all)); }
); );
like( like(
$output, $output,
@@ -69,7 +70,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset003.txt", qw(--ignore-user remote --match-command Query --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset003.txt", qw(--ignore-user remote --match-command Query --print)); }
); );
like( like(
$output, $output,
@@ -78,7 +79,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset004.txt", qw(--busy-time 25 --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset004.txt", qw(--busy-time 25 --print)); }
); );
like( like(
$output, $output,
@@ -87,7 +88,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset004.txt", qw(--busy-time 30 --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset004.txt", qw(--busy-time 30 --print)); }
); );
is( is(
$output, $output,
@@ -96,7 +97,7 @@ is(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset005.txt", qw(--idle-time 15 --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset005.txt", qw(--idle-time 15 --print)); }
); );
like( like(
$output, $output,
@@ -105,7 +106,7 @@ like(
); );
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset006.txt", qw(--match-state Locked --ignore-state), "''", qw(--busy-time 5 --print)); } sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset006.txt", qw(--match-state Locked --ignore-state), "''", qw(--busy-time 5 --print)); }
); );
like( like(
$output, $output,
@@ -116,7 +117,7 @@ like(
# The queries in recset002 are both State: Locked which is ignored # The queries in recset002 are both State: Locked which is ignored
# by default so nothing should match, not even for --match-all. # by default so nothing should match, not even for --match-all.
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset002.txt", sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset002.txt",
qw(--match-all --print)); } qw(--match-all --print)); }
); );
is( is(
@@ -127,7 +128,7 @@ is(
# Now --match-all should match. # Now --match-all should match.
$output = output( $output = output(
sub { pt_kill::main("$trunk/t/lib/samples/pl/recset002.txt", sub { pt_kill::main(@args, "$trunk/t/lib/samples/pl/recset002.txt",
qw(--match-all --victims all --print --ignore-state blahblah)); } qw(--match-all --victims all --print --ignore-state blahblah)); }
); );
like( like(

2
t/pt-kill/standard_options.t
View File

@@ -61,7 +61,7 @@ SKIP: {
# Issue 391: Add --pid option to all scripts # Issue 391: Add --pid option to all scripts
# ######################################################################### # #########################################################################
`touch /tmp/pt-script.pid`; `touch /tmp/pt-script.pid`;
$output = `$cmd $trunk/t/lib/samples/pl/recset006.txt --match-state Locked --print --pid /tmp/pt-script.pid 2>&1`; $output = `$cmd --test-matching $trunk/t/lib/samples/pl/recset006.txt --match-state Locked --print --pid /tmp/pt-script.pid 2>&1`;
like( like(
$output, $output,
qr{PID file /tmp/pt-script.pid already exists}, qr{PID file /tmp/pt-script.pid already exists},