Merge lp:~percona-toolkit-dev/percona-toolkit/fix-923896 into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

The new tests need to be more descriptive than "ok !$@;".

review: Needs Fixing

[lp:~percona-toolkit-dev/percona-toolkit/fix-923896]

270. By Brian Fraser <email address hidden> on 2012-05-30

Name the tests for 923896's fix

[Daniel Nichter (daniel-nichter)]

review: Approve

[Daniel Nichter (daniel-nichter)]

review: Approve

[Brian Fraser (fraserbn)]

review: Approve

=== modified file 'bin/pt-kill'
--- bin/pt-kill	2012-05-24 17:25:20 +0000
+++ bin/pt-kill	2012-05-30 14:42:19 +0000
@@ -2177,6 +2177,7 @@
       }
 
       if ( $find_spec{busy_time} && ($query->{Command} || '') eq 'Query' ) {
+         next QUERY unless defined $query->{Time};
          if ( $query->{Time} < $find_spec{busy_time} ) {
             PTDEBUG && _d("Query isn't running long enough");
             next QUERY;
@@ -2186,6 +2187,7 @@
       }
 
       if ( $find_spec{idle_time} && ($query->{Command} || '') eq 'Sleep' ) {
+         next QUERY unless defined $query->{Time};
          if ( $query->{Time} < $find_spec{idle_time} ) {
             PTDEBUG && _d("Query isn't idle long enough");
             next QUERY;

=== modified file 'lib/Processlist.pm'
--- lib/Processlist.pm	2012-01-19 19:46:56 +0000
+++ lib/Processlist.pm	2012-05-30 14:42:19 +0000
@@ -470,6 +470,7 @@
 
       # Match special busy_time.
       if ( $find_spec{busy_time} && ($query->{Command} || '') eq 'Query' ) {
+         next QUERY unless defined($query->{Time});
          if ( $query->{Time} < $find_spec{busy_time} ) {
             PTDEBUG && _d("Query isn't running long enough");
             next QUERY;
@@ -480,6 +481,7 @@
 
       # Match special idle_time.
       if ( $find_spec{idle_time} && ($query->{Command} || '') eq 'Sleep' ) {
+         next QUERY unless defined($query->{Time});
          if ( $query->{Time} < $find_spec{idle_time} ) {
             PTDEBUG && _d("Query isn't idle long enough");
             next QUERY;

=== modified file 't/lib/Processlist.t'
--- t/lib/Processlist.t	2012-03-06 13:56:08 +0000
+++ t/lib/Processlist.t	2012-05-30 14:42:19 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 32;
+use Test::More tests => 34;
 
 use Processlist;
 use PerconaTest;
@@ -828,6 +828,39 @@
 );
 
 # #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/923896
+# #############################################################################
+
+%find_spec = (
+   busy_time => 1,
+   ignore    => {},
+   match     => {},
+);
+my $proc = {  'Time'    => undef,
+         'Command' => 'Query',
+         'db'      => undef,
+         'Id'      => '7',
+         'Info'    => undef,
+         'User'    => 'msandbox',
+         'State'   => '',
+         'Host'    => 'localhost'
+      };
+
+local $@;
+eval { $pl->find([$proc], %find_spec) };
+ok !$@,
+ "Bug 923896: NULL Time in processlist doesn't fail for busy_time+Command=Query";
+
+delete $find_spec{busy_time};
+$find_spec{idle_time} = 1;
+$proc->{Command}   = 'Sleep';
+
+local $@;
+eval { $pl->find([$proc], %find_spec) };
+ok !$@,
+ "Bug 923896: NULL Time in processlist doesn't fail for idle_time+Command=Sleep";
+
+# #############################################################################
 # Done.
 # #############################################################################
 exit;