commit 4beefd8ce4eb9d0bd1b57ac48a9d9dc011690155 Author: stack Date: Thu Oct 8 13:04:25 2015 -0700 HBASE-14349 pre-commit zombie finder is overly broad; ADDENDUM diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index a781b80..69ebdb6 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -836,7 +836,7 @@ checkLineLengths () { zombieCount() { # HBase tests have been flagged with an innocuous '-Dhbase.test' just so they can # be identified as hbase in a process listing. - echo `jps -v | grep -e surefirebooter -e '-Dhbase.test' | wc -l` + echo `jps -v | grep surefirebooter | grep '-Dhbase.test' | wc -l` } ############################################################################### @@ -887,14 +887,14 @@ runTests () { echo "************ BEGIN zombies jstack extract" # HBase tests have been flagged with an innocuous '-Dhbase.test' just so they can # be identified as hbase in a process listing. - ZB_STACK=`jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"` - jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack + ZB_STACK=`jps -v | grep surefirebooter | grep '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"` + jps -v | grep surefirebooter | grep '-Dhbase.test' | 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 - jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs kill -9 + jps -v | grep surefirebooter | grep '-Dhbase.test' | cut -d ' ' -f 1 | xargs kill -9 else echo "We're ok: there is no zombie test, but some tests took some time to stop" fi