You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2020/04/03 21:38:29 UTC
[hbase] branch HBASE-24049-packaging-integration-hadoop-2.10.0
updated (6dbd7de -> d1e5af3)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a change to branch HBASE-24049-packaging-integration-hadoop-2.10.0
in repository https://gitbox.apache.org/repos/asf/hbase.git.
discard 6dbd7de HBASE-24049 use hadoop-2.10.0 for "packaging and integration" check
add 030e833 HBASE-24052 Add debug+fix to TestMasterShutdown
add 3d4124c HBASE-24079 [Flakey Tests] Misc fixes and debug; fix BindException in Thrift tests; add waits on quota table to come online; etc.
add fded2b9 HBASE-23846 Removed deprecated setMaxVersions(int) from Scan
add e5a8435 HBASE-24078 SpotBugs check automatically skip inapplicable modules
add 6f213e9 HBASE-24075: Fix a race between master shutdown and metrics (re)init
add 52c1013 HBASE-24096 Fix TestRSGroupsBalance (#1402)
add 834f89d HBASE-23678 : Builder API for version management - setVersionsWithTim… (#1381)
add fb17ecd HBASE-23842 Removed deprecated Scan(byte[], byte[]) from Scan
add 0dcbf80 HBASE-23937 : Support Online LargeLogs similar to SlowLogs APIs (#1346)
add 3e85407 HBASE-23937 : Documentation for get_largelog_responses command (ADDENDUM)
add 0595200 HBASE-24097 [Flakey Tests] TestSnapshotScannerHDFSAclController#testRestoreSnapshot (#1405)
add e85dfdc HBASE-24092 Fix links to build reports generated by nightly job
add e197aa3 HBASE-24100 [Flakey Tests] Add test to check we work properly when port clash setting up thriftserver
add 040a0a7 HBASE-24071 [JDK11] Remove `unit` filter from nightly and precommit jobs
add ae1f928 HBASE-24051 Allows indirect inheritance to CanUnbuffer (#1406)
add 554678e Revert "HBASE-24051 Allows indirect inheritance to CanUnbuffer (#1406)"
add 4ea819b HBASE-24100 [Flakey Tests] Add test to check we work properly when port clash setting up thriftserver Addendum; add missing @ClassRule
add 4ddf55d HBASE-23843 Removed deprecated Scan(byte[]) from Scan
add 0b3918f HBASE-24021 Fail fast when bulkLoadHFiles method catch some IOException (#1343)
add f00753b HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1414)
add 60959df HBASE-24084 Fix missing jdk8 dependencies in hbase-assembly/hadoop-two-compat
add b2c9a06 HBASE-24103 [Flakey Tests] TestSnapshotScannerHDFSAclController (#1416)
add 37aa669 HBASE-24080 [flakey test] TestRegionReplicaFailover.testSecondaryRegionKill fails. (#1421)
add edca9c3 HBASE-24107 [Flakey Test] TestThriftServerCmdLine.testRunThriftServer NPEs if InfoServer port clash
add 4565f74 HBASE-24072 Nightlies reporting OutOfMemoryError: unable to create new native thread Set the forkcount down from 0.5C to 0.25C.
add 2a95fff HBASE-24102 : Remove decommissioned RS from target servers while unlo… (#1417)
add 10cbb3f HBASE-24086 Disable output stream capability enforcement when running on LocalFileSystem
new d1e5af3 HBASE-24049 use hadoop-2.10.0 for "packaging and integration" check
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6dbd7de)
\
N -- N -- N refs/heads/HBASE-24049-packaging-integration-hadoop-2.10.0 (d1e5af3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/Jenkinsfile | 12 +-
dev-support/Jenkinsfile_GitHub | 2 -
dev-support/docker/Dockerfile | 2 +-
dev-support/hbase-personality.sh | 25 +-
.../src/main/assembly/hadoop-two-compat.xml | 134 ++++---
.../hbase/backup/impl/BackupSystemTable.java | 10 +-
.../java/org/apache/hadoop/hbase/client/Admin.java | 10 +-
.../hadoop/hbase/client/AdminOverAsyncAdmin.java | 6 +-
.../org/apache/hadoop/hbase/client/AsyncAdmin.java | 6 +-
.../hadoop/hbase/client/AsyncHBaseAdmin.java | 6 +-
.../client/ColumnFamilyDescriptorBuilder.java | 23 ++
...SlowLogQueryFilter.java => LogQueryFilter.java} | 25 +-
.../{SlowLogRecord.java => OnlineLogRecord.java} | 45 +--
.../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 47 ++-
.../java/org/apache/hadoop/hbase/client/Scan.java | 51 +--
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 20 +-
.../hbase/shaded/protobuf/RequestConverter.java | 18 +-
.../apache/hadoop/hbase/client/TestOperation.java | 2 +-
.../apache/hadoop/hbase/util/CommonFSUtils.java | 16 +-
.../coprocessor/TestRowProcessorEndpoint.java | 10 +-
.../client/example/MultiThreadedClientExample.java | 2 +-
.../hadoop/hbase/master/MetricsMasterWrapper.java | 5 +
.../hbase/master/MetricsMasterSourceImpl.java | 4 +-
.../hbase/mapreduce/IntegrationTestBulkLoad.java | 2 +-
.../hadoop/hbase/mttr/IntegrationTestMTTR.java | 2 +-
.../hadoop/hbase/mapred/TableRecordReaderImpl.java | 6 +-
.../apache/hadoop/hbase/mapreduce/CellCounter.java | 2 +-
.../apache/hadoop/hbase/mapreduce/ExportUtils.java | 2 +-
.../apache/hadoop/hbase/mapreduce/HashTable.java | 2 +-
.../hadoop/hbase/mapreduce/TableInputFormat.java | 2 +-
.../mapreduce/replication/VerifyReplication.java | 4 +-
.../hadoop/hbase/mob/mapreduce/MobRefReporter.java | 2 +-
.../hadoop/hbase/ScanPerformanceEvaluation.java | 2 +-
.../TestMultiTableSnapshotInputFormatImpl.java | 8 +-
.../mapreduce/TestTableSnapshotInputFormat.java | 6 +-
.../hbase/mapreduce/TestTimeRangeMapRed.java | 2 +-
.../src/main/protobuf/Admin.proto | 3 +
.../src/main/protobuf/TooSlowLog.proto | 11 +
.../hadoop/hbase/rest/ScannerResultGenerator.java | 6 +-
.../apache/hadoop/hbase/rest/TableResource.java | 2 +-
.../hadoop/hbase/rest/PerformanceEvaluation.java | 7 +-
.../hadoop/hbase/rest/TestScannersWithFilters.java | 21 +-
.../hadoop/hbase/io/hfile/bucket/BucketCache.java | 10 +-
.../org/apache/hadoop/hbase/ipc/RpcServer.java | 5 +-
.../hadoop/hbase/master/CachedClusterId.java | 19 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 3 +-
.../hbase/master/MetricsMasterWrapperImpl.java | 4 +
.../master/procedure/RSProcedureDispatcher.java | 27 +-
.../hadoop/hbase/regionserver/CompactSplit.java | 27 +-
.../apache/hadoop/hbase/regionserver/HRegion.java | 26 +-
.../hadoop/hbase/regionserver/HRegionServer.java | 39 +-
.../hadoop/hbase/regionserver/RSRpcServices.java | 16 +
...owLogEventHandler.java => LogEventHandler.java} | 67 +++-
.../hbase/regionserver/slowlog/RpcLogDetails.java | 24 +-
.../regionserver/slowlog/SlowLogRecorder.java | 35 +-
.../hbase/rsgroup/RSGroupInfoManagerImpl.java | 2 +-
.../apache/hadoop/hbase/rsgroup/RSGroupUtil.java | 5 +-
.../org/apache/hadoop/hbase/util/RegionMover.java | 28 +-
.../apache/hadoop/hbase/HBaseTestingUtility.java | 2 +-
.../apache/hadoop/hbase/TestCachedClusterId.java | 5 +-
.../hadoop/hbase/TestClusterPortAssignment.java | 16 +-
.../org/apache/hadoop/hbase/TestSerialization.java | 6 +-
.../TestServerSideScanMetricsFromClientSide.java | 46 ++-
.../org/apache/hadoop/hbase/TimestampTestBase.java | 2 +-
.../hadoop/hbase/client/FromClientSideBase.java | 36 +-
.../org/apache/hadoop/hbase/client/TestAdmin2.java | 8 +-
.../hbase/client/TestAsyncRegionAdminApi.java | 30 +-
.../hadoop/hbase/client/TestFromClientSide.java | 100 ++---
.../hadoop/hbase/client/TestFromClientSide3.java | 9 +-
.../hadoop/hbase/client/TestFromClientSide4.java | 24 +-
.../hadoop/hbase/client/TestFromClientSide5.java | 59 +--
.../TestGetScanColumnsWithNewVersionBehavior.java | 2 +-
.../hadoop/hbase/client/TestMasterRegistry.java | 7 +-
.../hbase/client/TestMultipleTimestamps.java | 6 +-
.../hbase/client/TestScannersFromClientSide.java | 5 +-
.../hbase/client/TestTableSnapshotScanner.java | 7 +-
.../hadoop/hbase/client/TestTimestampsFilter.java | 2 +-
.../coprocessor/TestOpenTableInCoprocessor.java | 2 +-
.../hbase/filter/TestDependentColumnFilter.java | 8 +-
.../org/apache/hadoop/hbase/filter/TestFilter.java | 299 +++++++-------
.../io/encoding/TestLoadAndSwitchEncodeOnDisk.java | 2 +-
.../hfile/TestScannerSelectionUsingKeyRange.java | 2 +-
.../io/hfile/bucket/TestBucketCacheRefCnt.java | 5 +-
.../hadoop/hbase/master/MockRegionServer.java | 6 +
.../hadoop/hbase/master/TestMasterShutdown.java | 58 +--
.../assignment/TestRegionMoveAndAbandon.java | 4 +-
.../hbase/master/balancer/BalancerTestBase.java | 5 +-
.../hbase/mob/TestDefaultMobStoreFlusher.java | 2 +-
.../hadoop/hbase/mob/TestMobDataBlockEncoding.java | 2 +-
.../hadoop/hbase/mob/TestMobStoreScanner.java | 2 +-
.../TestQuotaObserverChoreRegionReports.java | 7 +
.../hbase/quotas/TestSpaceQuotasWithSnapshots.java | 9 +
.../hbase/regionserver/TestAtomicOperation.java | 2 +-
.../hbase/regionserver/TestBlocksScanned.java | 2 +-
.../hadoop/hbase/regionserver/TestBulkLoad.java | 17 +
.../hadoop/hbase/regionserver/TestCompaction.java | 3 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 80 ++--
.../hadoop/hbase/regionserver/TestHStoreFile.java | 6 +-
.../hadoop/hbase/regionserver/TestKeepDeletes.java | 6 +-
.../hadoop/hbase/regionserver/TestMinVersions.java | 191 ++++++---
.../regionserver/TestRegionReplicaFailover.java | 8 +-
.../hbase/regionserver/TestRegionReplicas.java | 31 +-
.../TestRegionServerReadRequestMetrics.java | 4 +-
.../TestRegionServerReportForDuty.java | 1 +
.../hbase/regionserver/TestScanWithBloomError.java | 2 +-
.../hadoop/hbase/regionserver/TestScanner.java | 7 +-
.../regionserver/TestScannerWithBulkload.java | 2 +-
.../hbase/regionserver/TestSeekOptimizations.java | 2 +-
.../apache/hadoop/hbase/regionserver/TestTags.java | 8 +-
.../hadoop/hbase/regionserver/TestWideScanner.java | 2 +-
.../regionserver/slowlog/TestSlowLogRecorder.java | 104 ++++-
.../replication/TestReplicationTrackerZKImpl.java | 13 +-
.../hbase/rsgroup/VerifyingRSGroupAdmin.java | 8 +-
.../security/access/TestAccessController.java | 11 +-
.../access/TestCellACLWithMultipleVersions.java | 11 +-
.../hbase/security/access/TestHDFSAclHelper.java | 173 +++++++++
.../TestSnapshotScannerHDFSAclController.java | 432 +++++++--------------
.../TestSnapshotScannerHDFSAclController2.java | 185 +++++++++
.../hbase/security/token/TestZKSecretWatcher.java | 5 +-
.../security/visibility/TestVisibilityLabels.java | 2 +-
.../hadoop/hbase/util/BaseTestHBaseFsck.java | 2 +-
.../apache/hadoop/hbase/util/TestRegionMover.java | 144 ++++++-
hbase-shell/src/main/ruby/hbase/admin.rb | 28 +-
hbase-shell/src/main/ruby/hbase/table.rb | 4 +-
hbase-shell/src/main/ruby/shell.rb | 1 +
...wlog_responses.rb => get_largelog_responses.rb} | 40 +-
.../hbase/thrift/ThriftHBaseServiceHandler.java | 12 +-
.../hbase/thrift2/ThriftHBaseServiceHandler.java | 22 +-
.../hadoop/hbase/thrift2/ThriftUtilities.java | 142 ++++---
.../hadoop/hbase/thrift2/client/ThriftAdmin.java | 23 +-
.../hadoop/hbase/thrift2/generated/TAppend.java | 2 +-
.../hbase/thrift2/generated/TAuthorization.java | 2 +-
.../hbase/thrift2/generated/TBloomFilterType.java | 2 +-
.../hbase/thrift2/generated/TCellVisibility.java | 2 +-
.../hadoop/hbase/thrift2/generated/TColumn.java | 2 +-
.../thrift2/generated/TColumnFamilyDescriptor.java | 2 +-
.../hbase/thrift2/generated/TColumnIncrement.java | 2 +-
.../hbase/thrift2/generated/TColumnValue.java | 2 +-
.../hbase/thrift2/generated/TCompareOperator.java | 2 +-
.../thrift2/generated/TCompressionAlgorithm.java | 2 +-
.../hbase/thrift2/generated/TConsistency.java | 2 +-
.../thrift2/generated/TDataBlockEncoding.java | 2 +-
.../hadoop/hbase/thrift2/generated/TDelete.java | 2 +-
.../hbase/thrift2/generated/TDeleteType.java | 2 +-
.../hbase/thrift2/generated/TDurability.java | 2 +-
.../hadoop/hbase/thrift2/generated/TGet.java | 2 +-
.../hbase/thrift2/generated/THBaseService.java | 216 +++++------
.../hbase/thrift2/generated/THRegionInfo.java | 2 +-
.../hbase/thrift2/generated/THRegionLocation.java | 2 +-
.../hadoop/hbase/thrift2/generated/TIOError.java | 2 +-
.../hbase/thrift2/generated/TIllegalArgument.java | 2 +-
.../hadoop/hbase/thrift2/generated/TIncrement.java | 2 +-
.../hbase/thrift2/generated/TKeepDeletedCells.java | 2 +-
...lowLogQueryFilter.java => TLogQueryFilter.java} | 200 ++++++++--
.../generated/{TReadType.java => TLogType.java} | 19 +-
.../hadoop/hbase/thrift2/generated/TMutation.java | 2 +-
.../thrift2/generated/TNamespaceDescriptor.java | 2 +-
.../{TSlowLogRecord.java => TOnlineLogRecord.java} | 86 ++--
.../hadoop/hbase/thrift2/generated/TPut.java | 2 +-
.../hadoop/hbase/thrift2/generated/TReadType.java | 2 +-
.../hadoop/hbase/thrift2/generated/TResult.java | 2 +-
.../hbase/thrift2/generated/TRowMutations.java | 2 +-
.../hadoop/hbase/thrift2/generated/TScan.java | 2 +-
.../hbase/thrift2/generated/TServerName.java | 2 +-
.../hbase/thrift2/generated/TTableDescriptor.java | 2 +-
.../hadoop/hbase/thrift2/generated/TTableName.java | 2 +-
.../hbase/thrift2/generated/TThriftServerType.java | 2 +-
.../hadoop/hbase/thrift2/generated/TTimeRange.java | 2 +-
.../org/apache/hadoop/hbase/thrift2/hbase.thrift | 22 +-
.../hbase/thrift/TestBindExceptionHandling.java | 51 ++-
.../hadoop/hbase/thrift/TestThriftHttpServer.java | 68 ++--
.../hbase/thrift/TestThriftServerCmdLine.java | 172 ++++++--
.../hbase/thrift2/TestThrift2ServerCmdLine.java | 4 +-
.../hadoop/hbase/thrift2/TestThriftConnection.java | 2 +-
.../thrift2/TestThriftHBaseServiceHandler.java | 26 +-
pom.xml | 6 +-
src/main/asciidoc/_chapters/ops_mgt.adoc | 30 +-
177 files changed, 2760 insertions(+), 1641 deletions(-)
rename hbase-client/src/main/java/org/apache/hadoop/hbase/client/{SlowLogQueryFilter.java => LogQueryFilter.java} (86%)
rename hbase-client/src/main/java/org/apache/hadoop/hbase/client/{SlowLogRecord.java => OnlineLogRecord.java} (83%)
rename hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/slowlog/{SlowLogEventHandler.java => LogEventHandler.java} (75%)
create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestHDFSAclHelper.java
create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestSnapshotScannerHDFSAclController2.java
copy hbase-shell/src/main/ruby/shell/commands/{get_slowlog_responses.rb => get_largelog_responses.rb} (62%)
rename hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/{TSlowLogQueryFilter.java => TLogQueryFilter.java} (79%)
copy hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/{TReadType.java => TLogType.java} (70%)
rename hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/{TSlowLogRecord.java => TOnlineLogRecord.java} (94%)
copy hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestRefreshHFilesClient.java => hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestBindExceptionHandling.java (53%)
[hbase] 01/01: HBASE-24049 use hadoop-2.10.0 for "packaging and
integration" check
Posted by nd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch HBASE-24049-packaging-integration-hadoop-2.10.0
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit d1e5af3ba49d3a2f8ba501bd51cc0f650f76c984
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Thu Mar 26 16:35:28 2020 -0700
HBASE-24049 use hadoop-2.10.0 for "packaging and integration" check
---
dev-support/Jenkinsfile | 3 ++-
dev-support/hbase_nightly_pseudo-distributed-test.sh | 20 ++++++++++++++------
dev-support/hbase_nightly_source-artifact.sh | 2 +-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index 9a696e3..598f8c4 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -121,7 +121,7 @@ pipeline {
}
stage ('hadoop 2 cache') {
environment {
- HADOOP2_VERSION="2.8.5"
+ HADOOP2_VERSION="2.10.0"
}
steps {
// directory must be unique for each parallel stage, because jenkins runs them in the same workspace :(
@@ -656,6 +656,7 @@ pipeline {
--hbase-client-install "hbase-client" \
"hbase-install" \
"hadoop-2/bin/hadoop" \
+ hadoop-2/share/hadoop/yarn/timelineservice \
hadoop-2/share/hadoop/yarn/test/hadoop-yarn-server-tests-*-tests.jar \
hadoop-2/share/hadoop/mapreduce/hadoop-mapreduce-client-jobclient-*-tests.jar \
hadoop-2/bin/mapred \
diff --git a/dev-support/hbase_nightly_pseudo-distributed-test.sh b/dev-support/hbase_nightly_pseudo-distributed-test.sh
index 2d77184..b5fdf99 100755
--- a/dev-support/hbase_nightly_pseudo-distributed-test.sh
+++ b/dev-support/hbase_nightly_pseudo-distributed-test.sh
@@ -18,7 +18,7 @@
set -e
function usage {
- echo "Usage: ${0} [options] /path/to/component/bin-install /path/to/hadoop/executable /path/to/hadoop/hadoop-yarn-server-tests-tests.jar /path/to/hadoop/hadoop-mapreduce-client-jobclient-tests.jar /path/to/mapred/executable"
+ echo "Usage: ${0} [options] /path/to/component/bin-install /path/to/hadoop/executable /path/to/share/hadoop/yarn/timelineservice /path/to/hadoop/hadoop-yarn-server-tests-tests.jar /path/to/hadoop/hadoop-mapreduce-client-jobclient-tests.jar /path/to/mapred/executable"
echo ""
echo " --zookeeper-data /path/to/use Where the embedded zookeeper instance should write its data."
echo " defaults to 'zk-data' in the working-dir."
@@ -67,9 +67,10 @@ if [ $# -lt 5 ]; then
fi
component_install="$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
hadoop_exec="$(cd "$(dirname "$2")"; pwd)/$(basename "$2")"
-yarn_server_tests_test_jar="$(cd "$(dirname "$3")"; pwd)/$(basename "$3")"
-mapred_jobclient_test_jar="$(cd "$(dirname "$4")"; pwd)/$(basename "$4")"
-mapred_exec="$(cd "$(dirname "$5")"; pwd)/$(basename "$5")"
+timeline_service_dir="$(cd "$(dirname "$3")"; pwd)/$(basename "$3")"
+yarn_server_tests_test_jar="$(cd "$(dirname "$4")"; pwd)/$(basename "$4")"
+mapred_jobclient_test_jar="$(cd "$(dirname "$5")"; pwd)/$(basename "$5")"
+mapred_exec="$(cd "$(dirname "$6")"; pwd)/$(basename "$6")"
if [ ! -x "${hadoop_exec}" ]; then
echo "hadoop cli does not appear to be executable." >&2
@@ -285,18 +286,25 @@ echo "Starting up Hadoop"
if [ "${hadoop_version%.*.*}" -gt 2 ]; then
"${mapred_exec}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" &
else
- HADOOP_CLASSPATH="${yarn_server_tests_test_jar}" "${hadoop_exec}" jar "${mapred_jobclient_test_jar}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" &
+ HADOOP_CLASSPATH="${timeline_service_dir}/*:${timeline_service_dir}/lib/*:${yarn_server_tests_test_jar}" "${hadoop_exec}" jar "${mapred_jobclient_test_jar}" minicluster -format -writeConfig "${working_dir}/hbase-conf/core-site.xml" -writeDetails "${working_dir}/hadoop_cluster_info.json" >"${working_dir}/hadoop_cluster_command.out" 2>"${working_dir}/hadoop_cluster_command.err" &
fi
echo "$!" > "${working_dir}/hadoop.pid"
+# 2 + 4 + 8 + .. + 256 ~= 8.5 minutes.
+max_sleep_time=512
sleep_time=2
-until [ -s "${working_dir}/hbase-conf/core-site.xml" ]; do
+until [[ -s "${working_dir}/hbase-conf/core-site.xml" || "${sleep_time}" -ge "${max_sleep_time}" ]]; do
printf '\twaiting for Hadoop to finish starting up.\n'
sleep "${sleep_time}"
sleep_time="$((sleep_time*2))"
done
+if [ "${sleep_time}" -ge "${max_sleep_time}" ] ; then
+ echo "time out waiting for Hadoop to startup" >&2
+ exit 1
+fi
+
if [ "${hadoop_version%.*.*}" -gt 2 ]; then
echo "Verifying configs"
"${hadoop_exec}" --config "${working_dir}/hbase-conf/" conftest
diff --git a/dev-support/hbase_nightly_source-artifact.sh b/dev-support/hbase_nightly_source-artifact.sh
index cd17a32..bbd92fb 100755
--- a/dev-support/hbase_nightly_source-artifact.sh
+++ b/dev-support/hbase_nightly_source-artifact.sh
@@ -182,7 +182,7 @@ if mvn -DskipTests -Prelease --batch-mode -Dmaven.repo.local="${m2_tarbuild}" cl
fi
done
fi
-echo "Building a binary tarball from the source tarball failed. see srctarball_install.log for details."
+echo "Building a binary tarball from the source tarball failed. see ${working_dir}/srctarball_install.log for details."
# Copy up the rat.txt to the working dir so available in build archive in case rat complaints.
# rat.txt can be under any module target dir... copy them all up renaming them to include parent dir as we go.
find ${unpack_dir} -name rat.txt -type f | while IFS= read -r NAME; do cp -v "$NAME" "${working_dir}/${NAME//\//_}"; done