From b3a52ca980bc203a84260a69c8572947cd03e204 Mon Sep 17 00:00:00 2001 From: stack Date: Wed, 8 Apr 2020 21:16:27 -0700 Subject: [PATCH 1/2] HBASE-24150 Allow module tests run in parallel Pass --threads=2 to mvn when yetus runs so some parallelism when dependencies allow. --- dev-support/hbase-personality.sh | 5 ++++- dev-support/hbase_nightly_source-artifact.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 86998eafe319..854deff5b12d 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -140,7 +140,10 @@ function personality_modules clear_personality_queue - extra="-DHBasePatchProcess" + # At a few points, hbase modules can run their test suites in parallel + # Let it happen. Means we'll use more CPU but should be for short bursts. + # https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3 + extra="--threads=2 -DHBasePatchProcess" if [[ "${PATCH_BRANCH}" = branch-1* ]]; then extra="${extra} -Dhttps.protocols=TLSv1.2" fi diff --git a/dev-support/hbase_nightly_source-artifact.sh b/dev-support/hbase_nightly_source-artifact.sh index bbd92fb1650a..265abed98307 100755 --- a/dev-support/hbase_nightly_source-artifact.sh +++ b/dev-support/hbase_nightly_source-artifact.sh @@ -125,7 +125,7 @@ fi # See http://hbase.apache.org/book.html#maven.release echo "Maven details, in case our JDK doesn't match expectations:" -mvn --version --offline | tee "${working_dir}/maven_version" +mvn --threads=2 --version --offline | tee "${working_dir}/maven_version" echo "Do a clean building of the source artifact using code in ${component_dir}" cd "${component_dir}" @@ -172,7 +172,7 @@ fi cd "${unpack_dir}" echo "Follow the ref guide section on making a RC: Step 8 Build the binary tarball." -if mvn -DskipTests -Prelease --batch-mode -Dmaven.repo.local="${m2_tarbuild}" clean install \ +if mvn --threads=2 -DskipTests -Prelease --batch-mode -Dmaven.repo.local="${m2_tarbuild}" clean install \ assembly:single >"${working_dir}/srctarball_install.log" 2>&1; then for artifact in "${unpack_dir}"/hbase-assembly/target/hbase-*-bin.tar.gz; do if [ -f "${artifact}" ]; then From 260fbf65717339d940bf4f03f83161235f11baef Mon Sep 17 00:00:00 2001 From: stack Date: Thu, 9 Apr 2020 10:12:07 -0700 Subject: [PATCH 2/2] Address feedback from Nick --- dev-support/hbase-personality.sh | 2 +- dev-support/hbase_nightly_source-artifact.sh | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 854deff5b12d..98d73f562da6 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -140,7 +140,7 @@ function personality_modules clear_personality_queue - # At a few points, hbase modules can run their test suites in parallel + # At a few points, hbase modules can run build, test, etc. in parallel # Let it happen. Means we'll use more CPU but should be for short bursts. # https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3 extra="--threads=2 -DHBasePatchProcess" diff --git a/dev-support/hbase_nightly_source-artifact.sh b/dev-support/hbase_nightly_source-artifact.sh index 265abed98307..5d9902e5f047 100755 --- a/dev-support/hbase_nightly_source-artifact.sh +++ b/dev-support/hbase_nightly_source-artifact.sh @@ -125,7 +125,7 @@ fi # See http://hbase.apache.org/book.html#maven.release echo "Maven details, in case our JDK doesn't match expectations:" -mvn --threads=2 --version --offline | tee "${working_dir}/maven_version" +mvn --version --offline | tee "${working_dir}/maven_version" echo "Do a clean building of the source artifact using code in ${component_dir}" cd "${component_dir}" diff --git a/pom.xml b/pom.xml index df9ddfd38952..080cf0417937 100755 --- a/pom.xml +++ b/pom.xml @@ -4022,8 +4022,8 @@ hbase.apache.org HBase Website at hbase.apache.org + https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866 + --> file:///tmp