From cf8d3bd641ef9f69dabecec1b9e87272493fe825 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Wed, 2 Dec 2015 17:44:49 -0800
Subject: [PATCH] HBASE-14772 Improve zombie detector; be more discerning;
 part2

---
 dev-support/test-patch.sh      |  4 ++--
 dev-support/zombie-detector.sh | 33 +++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 99ae82e435b..22a77ff7972 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -867,8 +867,8 @@ runTests () {
   # NOTE!!!! The below code has been copied and pasted up into jenkins as an post-build task.
   # Make sure to update it too if you change the below (Or extract below into script to checkout
   # to run post-build)
-  export JIRA_COMMENT
-  $BASEDIR/dev-support/zombie-detector.sh ${BUILD_ID}
+  JIRA_COMMENT=``$BASEDIR/dev-support/zombie-detector.sh ${BUILD_ID}`
+  BAD=$?
 }
 
 ###############################################################################
diff --git a/dev-support/zombie-detector.sh b/dev-support/zombie-detector.sh
index d9a9809b4fb..91d10c7e178 100755
--- a/dev-support/zombie-detector.sh
+++ b/dev-support/zombie-detector.sh
@@ -18,7 +18,11 @@
 
 # Looks for any running zombies left over from old build runs.
 # Will report and try to do stack trace on stale processes so can
-# figure how they are hung.
+# figure how they are hung. Echos state as the script runs
+# on STDERR but prints final output on STDOUT formatted so it
+# will fold into the test result formatting done by test-patch.sh.
+# This script is called from test-patch.sh but also after tests
+# have run up on builds.apache.org.
 
 # TODO: format output to suit context -- test-patch, jenkins or dev env
 
@@ -107,8 +111,8 @@ zombies () {
   fi
   if [[ $ZOMBIE_TESTS_COUNT != 0 ]] ; then
     wait=30
-    echo "`date` Found ${ZOMBIE_TESTS_COUNT} suspicious java process(es) listed below; waiting ${wait}s to see if just slow to stop"
-    echo ${ZOMBIES}
+    echo "`date` Found ${ZOMBIE_TESTS_COUNT} suspicious java process(es) listed below; waiting ${wait}s to see if just slow to stop" >&2
+    echo ${ZOMBIES} >&2
     sleep ${wait}
     PIDS=`echo "${ZOMBIES}"|${AWK} '{print $1}'`
     ZOMBIE_TESTS_COUNT=0
@@ -118,29 +122,30 @@ zombies () {
       PS_OUTPUT=`ps -p $pid | tail +2 | grep -e "${HBASE_BUILD_TAG}"`
       if [[ ! -z "${PS_OUTPUT}" ]]
       then
-        echo "`date` Zombie: $PS_OUTPUT"
+        echo "`date` Zombie: $PS_OUTPUT" >&2
         let "ZOMBIE_TESTS_COUNT+=1"
         PS_STACK=`jstack $pid | grep -e "\.Test" | grep -e "\.java"| head -3`
-        echo "${PS_STACK}"
-        ZB_STACK="${ZB_STACK}\npid=${pid} ${PS_STACK}"
+        echo "${PS_STACK}" >&2
+        ZB_STACK="${ZB_STACK}\nPID=${pid} ${PS_STACK}"
       fi
     done
     if [[ $ZOMBIE_TESTS_COUNT != 0 ]]
     then
-      echo "`date` There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s)."
+      echo "`date` There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s)." >&2
       # If JIRA_COMMENT in environment, append our findings to it
-      JIRA_COMMENT="$JIRA_COMMENT
-        {color:red}-1 core zombie tests{color}.  There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s): ${ZB_STACK}"
-      # Exit with error
+      echo -e "$JIRA_COMMENT
+        {color:red}-1 core zombie tests{color}.  There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s):
+        ${ZB_STACK}"
+      # Exit with exit code of 1.
       exit 1
     else
-      echo "`date` We're ok: there was a zombie candidate but it went away"
-      JIRA_COMMENT="$JIRA_COMMENT
+      echo "`date` We're ok: there was a zombie candidate but it went away" >&2
+      echo "$JIRA_COMMENT
         {color:green}+1 core zombie tests -- (was a candidate but now) no zombies!{color}."
     fi
   else
-      echo "`date` We're ok: there is no zombie test"
-      JIRA_COMMENT="$JIRA_COMMENT
+      echo "`date` We're ok: there is no zombie test" >&2
+      echo "$JIRA_COMMENT
         {color:green}+1 core zombie tests -- no zombies!{color}."
   fi
 }