Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1046440-pt-stalk-purge_samples into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

review: Approve

[Brian Fraser (fraserbn)]

review: Approve

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2012-11-19 18:47:13 +0000
+++ bin/pt-stalk	2012-12-05 16:47:22 +0000
@@ -1189,6 +1189,11 @@
                # There will not be enough disk space, so do not collect.
                warn "Collect canceled because there will not be enough disk space after collecting another $margin MB"
             fi
+
+            # Purge old collect files.
+            if [ -d "$OPT_DEST" ]; then
+               purge_samples "$OPT_DEST" "$OPT_RETENTION_TIME"
+            fi
          fi
 
          # ##################################################################
@@ -1204,13 +1209,13 @@
          # Trigger/check/value is ok, sleep until next check.
          sleep_ok "$OPT_INTERVAL"
       fi
-
-      # Purge old collect file between checks.
-      if [ -d "$OPT_DEST" ]; then
-         purge_samples "$OPT_DEST" "$OPT_RETENTION_TIME"
-      fi
    done
 
+   # One final purge of old collect files, but only if in collect mode.
+   if [ "$OPT_COLLECT" -a -d "$OPT_DEST" ]; then
+      purge_samples "$OPT_DEST" "$OPT_RETENTION_TIME"
+   fi
+
    # Before exiting, the last collector may still be running.
    # Wait for it to finish in case the tool is part of a script,
    # or part of a test, so the caller has access to the collected