You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/04/22 02:42:20 UTC
[hbase] branch branch-2.2 updated: HBASE-24213 Backport the pre
commit changes for HBASE-24169 to all branches (#1548)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new f28cd06 HBASE-24213 Backport the pre commit changes for HBASE-24169 to all branches (#1548)
f28cd06 is described below
commit f28cd0693830553cd9f2c2e5974941abb4df0cb1
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Apr 22 10:26:10 2020 +0800
HBASE-24213 Backport the pre commit changes for HBASE-24169 to all branches (#1548)
Signed-off-by: stack <st...@apache.org>
---
dev-support/hbase-personality.sh | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index b6027e7..ddc2673 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -146,7 +146,7 @@ function personality_modules
fi
if [[ -n "${HADOOP_PROFILE}" ]]; then
- extra="${extra} -Dhadoop.profile=${HADOOP_PROFILE}"
+ extra="${extra} -Phadoop-${HADOOP_PROFILE}"
fi
# BUILDMODE value is 'full' when there is no patch to be tested, and we are running checks on
@@ -454,6 +454,14 @@ function shadedjars_rebuild
start_clock
+ local -a maven_args=('clean' 'verify' '-fae' '--batch-mode'
+ '-pl' 'hbase-shaded/hbase-shaded-check-invariants' '-am'
+ '-Dtest=NoUnitTests' '-DHBasePatchProcess' '-Prelease'
+ '-Dmaven.javadoc.skip=true' '-Dcheckstyle.skip=true' '-Dspotbugs.skip=true')
+ if [[ -n "${HADOOP_PROFILE}" ]]; then
+ maven_args+=("-Phadoop-${HADOOP_PROFILE}")
+ fi
+
# disabled because "maven_executor" needs to return both command and args
# shellcheck disable=2046
echo_and_redirect "${logfile}" \
@@ -585,13 +593,16 @@ function hadoopcheck_rebuild
else
hbase_hadoop2_versions="2.8.5 2.9.2 2.10.0"
fi
- else
- yetus_info "Setting Hadoop 2 versions to test based on branch-2.3+/master/feature branch rules."
+ elif [[ "${PATCH_BRANCH}" = branch-2.* ]]; then
+ yetus_info "Setting Hadoop 2 versions to test based on branch-2.3+ rules."
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
hbase_hadoop2_versions="2.10.0"
else
hbase_hadoop2_versions="2.10.0"
fi
+ else
+ yetus_info "Setting Hadoop 2 versions to null on master/feature branch rules since we do not support hadoop 2 for hbase 3.x any more."
+ hbase_hadoop2_versions=""
fi
if [[ "${PATCH_BRANCH}" = branch-1* ]]; then
yetus_info "Setting Hadoop 3 versions to test based on branch-1.x rules."
@@ -637,7 +648,7 @@ function hadoopcheck_rebuild
$(maven_executor) clean install \
-DskipTests -DHBasePatchProcess \
-Dhadoop-three.version="${hadoopver}" \
- -Dhadoop.profile=3.0
+ -Phadoop-3.0
count=$(${GREP} -c '\[ERROR\]' "${logfile}")
if [[ ${count} -gt 0 ]]; then
add_vote_table -1 hadoopcheck "${BUILDMODEMSG} causes ${count} errors with Hadoop v${hadoopver}."
@@ -651,7 +662,11 @@ function hadoopcheck_rebuild
fi
if [[ -n "${hbase_hadoop3_versions}" ]]; then
- add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions} or ${hbase_hadoop3_versions}."
+ if [[ -n "${hbase_hadoop2_versions}" ]]; then
+ add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions} or ${hbase_hadoop3_versions}."
+ else
+ add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop3_versions}."
+ fi
else
add_vote_table +1 hadoopcheck "Patch does not cause any errors with Hadoop ${hbase_hadoop2_versions}."
fi