Merge pull request #405 from dreamydb/3.0

PT-2541 - Print database name when logging pt-kill output to file

Author: svetasmirnova

bin/pt-kill

@@ -7671,9 +7671,9 @@ sub main {
                   }
                   printf "%s\n", Transformers::hash_to_json(\%jsonOutput);
                } else {
-                  printf "# %s %s %d (%s %d sec) %s\n",
+                  printf "# %s %s %d (Db: %s) (%s %d sec) %s\n",
                      ts(time), $o->get('kill-query') ? 'KILL QUERY' : 'KILL',
-                     $query->{Id}, ($query->{Command} || 'NULL'), $query->{Time},
+                     $query->{Id}, ($query->{db} || 'NULL'), ($query->{Command} || 'NULL'), $query->{Time},
                      $qinfo;
                }
             }

t/pt-kill/group_by.t

@@ -32,7 +32,7 @@ $output = output(
 );
 like(
    $output,
-   qr/# \S+ KILL 3 \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 4 \(Query 5 sec\) select c from t where id='foo';/,
+   qr/# \S+ KILL 3 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 4 \(Db: foo\) \(Query 5 sec\) select c from t where id='foo';/,
    "Kill all but oldest"
 );
 
@@ -44,7 +44,7 @@ $output = output(
 );
 like(
    $output,
-   qr/# \S+ KILL 3 \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Query 9 sec\) select c from t where id='foo';/,
+   qr/# \S+ KILL 3 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';/,
    "Kill all but oldest, matching specific user"
 );
 
@@ -70,7 +70,7 @@ $output = output(
 );
 like(
    $output,
-   qr/# \S+ KILL 1 \(Query 10 sec\)/,
+   qr/# \S+ KILL 1 \(Db: foo\) \(Query 10 sec\)/,
    "Any busy time matches"
 );
 
@@ -94,7 +94,7 @@ $output = output(
 );
 like(
    $output,
-   qr/# \S+ KILL 3 \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Query 9 sec\) select c from t where id='foo';/,
+   qr/# \S+ KILL 3 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';\n# \S+ KILL 2 \(Db: foo\) \(Query 9 sec\) select c from t where id='foo';/,
    "Each busy time matches"
 );
 

t/pt-kill/match.t

@@ -31,7 +31,7 @@ $output = output(
 );
 like(
    $output,
-   qr/KILL 9 \(Query 0 sec\) show processlist/,
+   qr/KILL 9 \(Db: NULL\) \(Query 0 sec\) show processlist/,
    '--match-info'
 );
 
@@ -49,7 +49,7 @@ $output = output(
 );
 like(
    $output,
-   qr/KILL 2 \(Query 5 sec\) select \* from foo2/,
+   qr/KILL 2 \(Db: foo\) \(Query 5 sec\) select \* from foo2/,
    "Can override default ignore State=Locked with --ignore-state ''"
 );
 
@@ -58,7 +58,7 @@ $output = output(
 );
 like(
    $output,
-   qr/KILL 29393378 \(Query 3 sec\)/,
+   qr/KILL 29393378 \(Db: happy\) \(Query 3 sec\)/,
    '--match-state'
 );
 
@@ -103,7 +103,7 @@ $output = output(
 );
 like(
    $output,
-   qr/KILL 29392005 \(Sleep 17 sec\) NULL/,
+   qr/KILL 29392005 \(Db: happy\) \(Sleep 17 sec\) NULL/,
    '--idle-time'
 );
 
@@ -112,7 +112,7 @@ $output = output(
 );
 like(
    $output,
-   qr/KILL 2 \(Query 9 sec\) select \* from foo2/,
+   qr/KILL 2 \(Db: foo\) \(Query 9 sec\) select \* from foo2/,
    "--match-state Locked --ignore-state '' --busy-time 5"
 );
 

t/pt-kill/pt_167.t

@@ -80,7 +80,7 @@ my $output = output(
 
 like(
    $output,
-   qr/KILL $pid \(Execute/,
+   qr/KILL $pid \(Db: sakila\) \(Execute/,
    '--kill-query'
 ) or diag($output);
 

t/pt-kill/samples/kill-recset011-001.txt

@@ -1,2 +1,2 @@
-KILL 4 (Query 6 sec) /* fruit=orange */ select 1 from fuits;
-KILL 3 (Query 6 sec) /* fruit=orange */ select 1 from fuits;
+KILL 4 (Db: db) (Query 6 sec) /* fruit=orange */ select 1 from fuits;
+KILL 3 (Db: db) (Query 6 sec) /* fruit=orange */ select 1 from fuits;