svn commit: r1425463 - /hbase/trunk/dev-support/test-patch.sh

[nk...@apache.org]

Author: nkeywal
Date: Sun Dec 23 13:15:21 2012
New Revision: 1425463

URL: http://svn.apache.org/viewvc?rev=1425463&view=rev
Log:
HBASE-7350 - Flakey tests make CI unreliable - addendum on the zombie detection

Modified:
    hbase/trunk/dev-support/test-patch.sh

Modified: hbase/trunk/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/test-patch.sh?rev=1425463&r1=1425462&r2=1425463&view=diff
==============================================================================
--- hbase/trunk/dev-support/test-patch.sh (original)
+++ hbase/trunk/dev-support/test-patch.sh Sun Dec 23 13:15:21 2012
@@ -621,16 +621,25 @@ runTests () {
   fi
   ZOMBIE_TESTS_COUNT=`jps | grep surefirebooter | wc -l`
   if [[ $ZOMBIE_TESTS_COUNT != 0 ]] ; then
-    echo "There are $ZOMBIE_TESTS_COUNT zombie tests, they should have been killed by surefire but survived"
-    echo "************ BEGIN zombies jstack extract"
-    jps | grep surefirebooter | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"
-    echo "************ END  zombies jstack extract"
-     JIRA_COMMENT="$JIRA_COMMENT
-
-     {color:red}-1 core zombie tests{color}.  There are zombie tests. See build logs for details."
-    BAD=1
+    #It seems sometimes the tests are not dying immediately. Let's give them 30s
+    echo "Suspicious java process found - waiting 30s to see if there are just slow to stop"
+    sleep 30
+    ZOMBIE_TESTS_COUNT=`jps | grep surefirebooter | wc -l`
+    if [[ $ZOMBIE_TESTS_COUNT != 0 ]] ; then
+      echo "There are $ZOMBIE_TESTS_COUNT zombie tests, they should have been killed by surefire but survived"
+      echo "************ BEGIN zombies jstack extract"
+      ZB_STACK=`jps | grep surefirebooter | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"`
+      jps | grep surefirebooter | cut -d ' ' -f 1 | xargs -n 1 jstack
+      echo "************ END  zombies jstack extract"
+      JIRA_COMMENT="$JIRA_COMMENT
+
+     {color:red}-1 core zombie tests{color}.  There are ${ZOMBIE_TESTS_COUNT} zombie test(s): ${ZB_STACK}"
+      BAD=1
+    else
+      echo "We're ok: there is no zombie test, but some tests took some time to stop"
+    fi
   else
-    echo "We're ok: there is no zombie tests"
+    echo "We're ok: there is no zombie test"
   fi
   return $BAD
 }