Merge lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-1019648 into lp:percona-toolkit/2.2

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-1019648]

546. By Daniel Nichter on 2013-03-12

Move code to get InnoDB status into its own sub.

[Daniel Nichter (daniel-nichter)]

Tests pass: https://refute.testnoir.com/percona-toolkit/jobs/percona-toolkit-full-branch-test/31/results

review: Approve

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2013-03-09 18:57:41 +0000
+++ bin/pt-stalk	2013-03-12 21:10:29 +0000
@@ -822,15 +822,14 @@
       log "Could not find the MySQL error log"
    fi
 
-   local innostat="SHOW /*!40100 ENGINE*/ INNODB STATUS\G"
    if [ "${mysql_version}" '>' "5.1" ]; then
       local mutex="SHOW ENGINE INNODB MUTEX"
    else
       local mutex="SHOW MUTEX STATUS"
    fi
-   $CMD_MYSQL $EXT_ARGV -e "$innostat" >> "$d/$p-innodbstatus1" &
-   $CMD_MYSQL $EXT_ARGV -e "$mutex"    >> "$d/$p-mutex-status1" &
-   open_tables                         >> "$d/$p-opentables1"   &
+   innodb_status 1
+   $CMD_MYSQL $EXT_ARGV -e "$mutex" >> "$d/$p-mutex-status1" &
+   open_tables                      >> "$d/$p-opentables1"   &
 
    local tcpdump_pid=""
    if [ "$CMD_TCPDUMP" -a  "$OPT_COLLECT_TCPDUMP" ]; then
@@ -968,9 +967,9 @@
       [ "$mysqld_pid" ] && kill -s 18 $mysqld_pid
    fi
 
-   $CMD_MYSQL $EXT_ARGV -e "$innostat" >> "$d/$p-innodbstatus2" &
-   $CMD_MYSQL $EXT_ARGV -e "$mutex"    >> "$d/$p-mutex-status2" &
-   open_tables                         >> "$d/$p-opentables2"   &
+   innodb_status 2
+   $CMD_MYSQL $EXT_ARGV -e "$mutex" >> "$d/$p-mutex-status2" &
+   open_tables                      >> "$d/$p-opentables2"   &
 
    kill $mysqladmin_pid
    [ "$tail_error_log_pid" ] && kill $tail_error_log_pid
@@ -1036,6 +1035,27 @@
    $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
 }
 
+innodb_status() {
+   local n=$1
+
+   local innostat=""
+
+   $CMD_MYSQL $EXT_ARGV -e "SHOW /*!40100 ENGINE*/ INNODB STATUS\G" \
+      >> "$d/$p-innodbstatus$n"
+   grep "END OF INNODB" "$d/$p-innodbstatus$n" >/dev/null || {
+      if [ -d /proc -a -d /proc/$mysqld_pid ]; then
+         for fd in /proc/$mysqld_pid/fd/*; do
+            file $fd | grep deleted >/dev/null && {
+               grep 'INNODB' $fd >/dev/null && {
+                  cat $fd > "$d/$p-innodbstatus$n"
+                  break
+               }
+            }
+         done
+      fi
+   }
+}
+
 # ###########################################################################
 # End collect package
 # ###########################################################################

=== modified file 'lib/bash/collect.sh'
--- lib/bash/collect.sh	2013-03-05 00:47:02 +0000
+++ lib/bash/collect.sh	2013-03-12 21:10:29 +0000
@@ -103,15 +103,14 @@
 
    # Get a sample of these right away, so we can get these without interaction
    # with the other commands we're about to run.
-   local innostat="SHOW /*!40100 ENGINE*/ INNODB STATUS\G"
    if [ "${mysql_version}" '>' "5.1" ]; then
       local mutex="SHOW ENGINE INNODB MUTEX"
    else
       local mutex="SHOW MUTEX STATUS"
    fi
-   $CMD_MYSQL $EXT_ARGV -e "$innostat" >> "$d/$p-innodbstatus1" &
-   $CMD_MYSQL $EXT_ARGV -e "$mutex"    >> "$d/$p-mutex-status1" &
-   open_tables                         >> "$d/$p-opentables1"   &
+   innodb_status 1
+   $CMD_MYSQL $EXT_ARGV -e "$mutex" >> "$d/$p-mutex-status1" &
+   open_tables                      >> "$d/$p-opentables1"   &
 
    # If TCP dumping is specified, start that on the server's port.
    local tcpdump_pid=""
@@ -272,9 +271,9 @@
       [ "$mysqld_pid" ] && kill -s 18 $mysqld_pid
    fi
 
-   $CMD_MYSQL $EXT_ARGV -e "$innostat" >> "$d/$p-innodbstatus2" &
-   $CMD_MYSQL $EXT_ARGV -e "$mutex"    >> "$d/$p-mutex-status2" &
-   open_tables                         >> "$d/$p-opentables2"   &
+   innodb_status 2
+   $CMD_MYSQL $EXT_ARGV -e "$mutex" >> "$d/$p-mutex-status2" &
+   open_tables                      >> "$d/$p-opentables2"   &
 
    # Kill backgrounded tasks.
    kill $mysqladmin_pid
@@ -349,6 +348,27 @@
    $CMD_MYSQL $EXT_ARGV -e "SELECT * FROM INFORMATION_SCHEMA.INNODB_LOCK_WAITS\G"
 }
 
+innodb_status() {
+   local n=$1
+
+   local innostat=""
+
+   $CMD_MYSQL $EXT_ARGV -e "SHOW /*!40100 ENGINE*/ INNODB STATUS\G" \
+      >> "$d/$p-innodbstatus$n"
+   grep "END OF INNODB" "$d/$p-innodbstatus$n" >/dev/null || {
+      if [ -d /proc -a -d /proc/$mysqld_pid ]; then
+         for fd in /proc/$mysqld_pid/fd/*; do
+            file $fd | grep deleted >/dev/null && {
+               grep 'INNODB' $fd >/dev/null && {
+                  cat $fd > "$d/$p-innodbstatus$n"
+                  break
+               }
+            }
+         done
+      fi
+   }
+}
+
 # ###########################################################################
 # End collect package
 # ###########################################################################