Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 f5d3987ae -> 62034b0c9 refs/heads/4.x-HBase-1.1 fcb2dde54 -> a56114757 refs/heads/4.x-HBase-1.2 a7f36076d -> 5ccf8ef3e refs/heads/master 8ee8f092a -> 0311e4f56
PHOENIX-4207 Improve zombie-test detection in test-patch.sh Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0311e4f5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0311e4f5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0311e4f5 Branch: refs/heads/master Commit: 0311e4f56fa10a6ea3eb3e0dce8a9d6fa70a48f8 Parents: 8ee8f09 Author: Josh Elser <els...@apache.org> Authored: Wed Sep 13 17:49:06 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Sep 14 15:03:29 2017 -0400 ---------------------------------------------------------------------- dev/test-patch.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0311e4f5/dev/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev/test-patch.sh b/dev/test-patch.sh index b2c0fa1..a1161fb 100755 --- a/dev/test-patch.sh +++ b/dev/test-patch.sh @@ -899,23 +899,23 @@ runTests () { {color:green}+1 core tests{color}. The patch passed unit tests in $modules." BAD=0 fi - ZOMBIE_TESTS_COUNT=`jps | grep surefirebooter | wc -l` + ZOMBIE_TESTS_COUNT=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | wc -l` if [[ $ZOMBIE_TESTS_COUNT != 0 ]] ; then #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` + ZOMBIE_TESTS_COUNT=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | 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 + ZB_STACK=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"` + jps -m | grep surefirebooter | grep "phoenix-.*/target" | 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 | grep surefirebooter | cut -d ' ' -f 1 | xargs kill -9 + jps -m | grep surefirebooter | grep "phoenix-.*/target" | 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