HBASE-14772 Improve zombie detector; be more discerning; part2; addendum -- fix indent
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5e430837 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e430837 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e430837 Branch: refs/heads/hbase-12439 Commit: 5e430837d3e4a7d159e84964357297c8ab42430d Parents: bbd53b8 Author: stack <st...@apache.org> Authored: Thu Dec 3 14:00:46 2015 -0800 Committer: stack <st...@apache.org> Committed: Thu Dec 3 14:01:22 2015 -0800 ---------------------------------------------------------------------- dev-support/test-patch.sh | 16 +++++++--------- dev-support/zombie-detector.sh | 9 ++++++--- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5e430837/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 0a731a7..19c5b7b 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -517,9 +517,8 @@ checkAntiPatterns () { if [[ $warnings != "" ]]; then JIRA_COMMENT="$JIRA_COMMENT - {color:red}-1 Anti-pattern{color}. The patch appears to have anti-pattern where BYTES_COMPARATOR was omitted: - $warnings." - return 1 + {color:red}-1 Anti-pattern{color}. The patch appears to have anti-pattern where BYTES_COMPARATOR was omitted: $warnings." + return 1 fi return 0 } @@ -540,9 +539,8 @@ checkInterfaceAudience () { if [[ $warnings != "" ]]; then JIRA_COMMENT="$JIRA_COMMENT - {color:red}-1 InterfaceAudience{color}. The patch appears to contain InterfaceAudience from hadoop rather than hbase: - $warnings." - return 1 + {color:red}-1 InterfaceAudience{color}. The patch appears to contain InterfaceAudience from hadoop rather than hbase: $warnings." + return 1 fi return 0 } @@ -595,7 +593,7 @@ checkBuildWithHadoopVersions() { echo "" export MAVEN_OPTS="${MAVEN_OPTS}" for HADOOP2_VERSION in $HADOOP2_VERSIONS ; do - echo "$MVN clean install -DskipTests -D${PROJECT_NAME}PatchProcess -Dhadoop-two.version=$HADOOP2_VERSION > $PATCH_DIR/patchJavacWithHadoop-$HADOOP2_VERSION.txt 2>&1" + echo "$MVN clean install -DskipTests -D${PROJECT_NAME}PatchProcess -Dhadoop-two.version=$HADOOP2_VERSION > $PATCH_DIR/patchJavacWithHadoop-$HADOOP2_VERSION.txt 2>&1" $MVN clean install -DskipTests -D${PROJECT_NAME}PatchProcess -Dhadoop-two.version=$HADOOP2_VERSION > $PATCH_DIR/patchJavacWithHadoop-$HADOOP2_VERSION.txt 2>&1 checkCompilationErrors $PATCH_DIR/patchJavacWithHadoop-$HADOOP2_VERSION.txt $HADOOP2_VERSION done @@ -857,7 +855,7 @@ runTests () { JIRA_COMMENT="$JIRA_COMMENT - {color:red}-1 core tests{color}. The patch failed these unit tests: + {color:red}-1 core tests{color}. The patch failed these unit tests: $failed_tests" BAD=1 JIRA_COMMENT=`$BASEDIR/dev-support/zombie-detector.sh ${BUILD_ID}` @@ -894,7 +892,7 @@ checkSiteXml () { fi JIRA_COMMENT="$JIRA_COMMENT - {color:green}+1 site{color}. The mvn post-site goal succeeds with this patch." + {color:green}+1 site{color}. The mvn post-site goal succeeds with this patch." return 0 } http://git-wip-us.apache.org/repos/asf/hbase/blob/5e430837/dev-support/zombie-detector.sh ---------------------------------------------------------------------- diff --git a/dev-support/zombie-detector.sh b/dev-support/zombie-detector.sh index 91d10c7..4eebaa3 100755 --- a/dev-support/zombie-detector.sh +++ b/dev-support/zombie-detector.sh @@ -134,19 +134,22 @@ zombies () { echo "`date` There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s)." >&2 # If JIRA_COMMENT in environment, append our findings to it echo -e "$JIRA_COMMENT - {color:red}-1 core zombie tests{color}. There are ${ZOMBIE_TESTS_COUNT} possible zombie test(s): + + {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" >&2 echo "$JIRA_COMMENT - {color:green}+1 core zombie tests -- (was a candidate but now) no zombies!{color}." + + {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" >&2 echo "$JIRA_COMMENT - {color:green}+1 core zombie tests -- no zombies!{color}." + + {color:green}+1 core zombie tests -- no zombies!{color}." fi }