[phoenix] branch master updated: PHOENIX-6044 Precommit script over-zealous zombie check may clobber parallel Phoenix test

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new ce83d74  PHOENIX-6044 Precommit script over-zealous zombie check may clobber parallel Phoenix test
ce83d74 is described below

commit ce83d74050a8cc1637068f3fb8980e14f9bde611
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Jul 24 16:37:16 2020 +0200

    PHOENIX-6044 Precommit script over-zealous zombie check may clobber parallel Phoenix test
---
 dev/test-patch.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/test-patch.sh b/dev/test-patch.sh
index cf5d8b4..62a6cd8 100755
--- a/dev/test-patch.sh
+++ b/dev/test-patch.sh
@@ -896,23 +896,23 @@ runTests () {
     {color:green}+1 core tests{color}.  The patch passed unit tests in $modules."
     BAD=0
   fi
-  ZOMBIE_TESTS_COUNT=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | wc -l`
+  ZOMBIE_TESTS_COUNT=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | grep $BASEDIR | 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 -m | grep surefirebooter | grep "phoenix-.*/target" | wc -l`
+    ZOMBIE_TESTS_COUNT=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | grep $BASEDIR | 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 -m | grep surefirebooter | grep "phoenix-.*/target" | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"`
+      ZB_STACK=`jps -m | grep surefirebooter | grep "phoenix-.*/target" | grep $BASEDIR | 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 -m | grep surefirebooter | grep "phoenix-.*/target" | cut -d ' ' -f 1 | xargs kill -9
+      jps -m | grep surefirebooter | grep "phoenix-.*/target" | grep $BASEDIR | 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