Merge lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-fails-when-variable-or-threshold-is-non-integer-1335322 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.9

[Frank Cizmich]

solves pt-stalk not handling non-integers

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2014-06-05 07:24:48 +0000
+++ bin/pt-stalk	2014-06-27 20:57:34 +0000
@@ -1245,13 +1245,12 @@
       if [ "$OPT_STALK" ]; then
          local value=$($TRIGGER_FUNCTION $OPT_VARIABLE)
          local trg_exit_status=$?
-
          if [ -z "$value" ]; then
             # No value.  Maybe we failed to connect to MySQL?
             warn "Detected value is empty; something failed?  Trigger exit status: $trg_exit_status"
             matched=""
             cycles_true=0
-         elif [ $value -gt $OPT_THRESHOLD ]; then
+         elif (( $(echo "$value $OPT_THRESHOLD" | awk '{print ($1 > $2)}') )); then
             matched="yes"
             cycles_true=$(($cycles_true + 1))
          else
 
=== modified file 't/pt-stalk/pt-stalk.t'
--- t/pt-stalk/pt-stalk.t	2013-08-13 03:45:38 +0000
+++ t/pt-stalk/pt-stalk.t	2014-06-27 20:57:34 +0000
@@ -402,6 +402,27 @@
    "Bug 942114: no bad find usage"
 );
 
+
+# ###########################################################################
+# Test that it handles floating point values 
+# ###########################################################################
+
+cleanup();
+
+system("$trunk/bin/pt-stalk --daemonize  --variable=PI --dest $dest  --no-collect --log $log_file --iterations=1  --run-time=2  --cycles=2  --sleep=1 --function $trunk/t/pt-stalk/samples/plugin003.sh --threshold 3.1415  --pid $pid_file --defaults-file=$cnf >$log_file 2>&1");
+
+
+sleep 5;
+PerconaTest::kill_program(pid_file => $pid_file);
+
+$output = `cat $log_file 2>/dev/null`;
+like(
+   $output,
+   qr/matched=yes/,
+   "Accepts floating point values as treshold variable"
+);
+
+
 # #############################################################################
 # Done.
 # #############################################################################
 
=== added file 't/pt-stalk/samples/plugin003.sh'
--- t/pt-stalk/samples/plugin003.sh	1970-01-01 00:00:00 +0000
+++ t/pt-stalk/samples/plugin003.sh	2014-06-27 20:57:34 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+trg_plugin() {
+   echo 3.1416
+}