From 49b570ed0ccb49cecd3515d444f3fef44a56d115 Mon Sep 17 00:00:00 2001
From: Sergey Kuzmichev <sergey.kuzmichev@percona.com>
Date: Thu, 10 Jun 2021 14:43:07 +0300
Subject: [PATCH] Fix for PT-1965 mysql-only lacks mysqladmin output (#492)

* Fix for PT-1965 mysql-only lacks mysqladmin output

This is a fix for PT-1965. Moved mysqladmin execution out of an if block
that contains stuff executed only when --mysql-only is not specified.
Before this fix, mysqladmin was not executed with --mysql-only.

* PT-1965: updated changelog to reflect the bug fixed
---
 Changelog    | 1 +
 bin/pt-stalk | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index ffd6241d..654553ef 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@ Changelog for Percona Toolkit
  * Fixed bug   PT-1914: Column data lost when 'Generated' is in the column comment
  * Fixed bug   PT-1919: pt-online-schema change drop_swap can lose triggers. (Thanks Bob)
  * Fixed bug   PT-1943:	BEFORE triggers are dropped after pt-online-schema-change run
+ * Fixed bug   PT-1965: pt-stalk --mysql-only doesn't collect mysqladmin outputs (Thanks Sergey Kuzmichev)
 
 v3.3.0 release 2021-01-14 
 
diff --git a/bin/pt-stalk b/bin/pt-stalk
index 2a6fa417..7d2d1f21 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -869,6 +869,11 @@ collect() {
       local strace_pid=$!
    fi
 
+   local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
+
+   $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
+   local mysqladmin_pid=$!
+
    if [ ! "$OPT_MYSQL_ONLY" ]; then
       ps -eaF  >> "$d/$p-ps"  &
       top -bn${OPT_RUN_TIME} >> "$d/$p-top" &
@@ -885,7 +890,6 @@ collect() {
          $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" &
       fi
 
-      local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
       if [ "$CMD_VMSTAT" ]; then
          $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &
          $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" &
@@ -898,9 +902,6 @@ collect() {
          $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" &
          $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" &
       fi
-
-      $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
-      local mysqladmin_pid=$!
    fi
 
    local have_lock_waits_table=""