Merge lp:~percona-toolkit-dev/percona-toolkit/pt-sift-processlist-aggregation-fix-bug-945842 into lp:percona-toolkit/2.0

[Baron Schwartz]

The old processlist format was one sample in a single file. The new one is many samples. This change makes awk exit after it sees the start of the second sample.

[Baron Schwartz (baron-xaprb)]

Dammit! Why do my "merge upstream" changes show up as a changeset? Why can't I bzr merge upstream, make a change, and then push only that changeset into a new branch?

review: Needs Fixing

Unmerged revisions

=== modified file 'bin/pt-sift'
--- bin/pt-sift	2012-03-02 20:23:54 +0000
+++ bin/pt-sift	2012-03-05 01:03:21 +0000
@@ -356,7 +356,23 @@
             fi
             for word in State Command; do
                echo "    $word"
-               awk -F: "/^ *$word:/{print \$2}" "${PROCESSLIST_FILE}" \
+               awk -F: -v column="$word" '
+               BEGIN {
+                  regex = "^ *" column
+               }
+               {
+                  if ( $1 ~ regex ) {
+                     print $2;
+                  }
+                  # Newer versions of pt-stalk gather several samples. We will
+                  # analyze only the first sample.
+                  if ( $0 ~ /^TS/ ) {
+                     ts++;
+                     if (ts > 1) {
+                        exit
+                     }
+                  }
+               }' "${PROCESSLIST_FILE}" \
                   | sort | uniq -c | sort -rn | head -n 5
             done