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/03/31 00:29:49 UTC
[hbase] branch HBASE-24049-packaging-integration-hadoop-2.10.0
updated (5fde939 -> 6dbd7de)
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.
omit 5fde939 HBASE-24049 use hadoop-2.10.0 for "packaging and integration" check
add 50c8f49 HBASE-23853 [Flakey Test] TestBlockEvictionFromClient#testBlockRefCountAfterSplits (#1363)
add 78eecd3 HBASE-23381 Ensure Netty client receives at least one response before considering SASL negotiation complete
add eb1fec1 HBASE-24040 WALFactory.Providers.multiwal causes StackOverflowError (#1338)
add 3f24894 HBASE-24057 Add modules to mapreduce job classpaths (#1359)
add aaae46c HBASE-23845 Removed deprecated setMaxVersions from Scan (#1208)
add 5d4e020 HBASE-23798 Remove hbase-prototcol module (#1360)
add d319ce8 HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1378)
add d77dbef HBASE-24007 Get `-PrunLargeTests` passing on JDK11 (#1351)
add f365cb5 Revert "HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1378)" (#1386)
add d318ca1 HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1387)
new 6dbd7de 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 (5fde939)
\
N -- N -- N refs/heads/HBASE-24049-packaging-integration-hadoop-2.10.0 (6dbd7de)
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 | 1 +
.../hbase_nightly_pseudo-distributed-test.sh | 20 +-
dev-support/hbase_nightly_source-artifact.sh | 2 +-
hbase-assembly/pom.xml | 4 -
hbase-client/pom.xml | 4 -
.../java/org/apache/hadoop/hbase/client/Admin.java | 46 +-
.../java/org/apache/hadoop/hbase/client/Scan.java | 22 +-
.../java/org/apache/hadoop/hbase/client/Table.java | 70 +-
.../hadoop/hbase/client/coprocessor/Batch.java | 39 +-
.../hadoop/hbase/ipc/CoprocessorRpcChannel.java | 2 +-
.../hadoop/hbase/ipc/NettyRpcConnection.java | 8 +-
.../hadoop/hbase/ipc/ServerRpcController.java | 25 +-
.../apache/hadoop/hbase/protobuf/ProtobufUtil.java | 1807 --------------------
.../hbase/security/AbstractHBaseSaslRpcClient.java | 16 +-
.../security/NettyHBaseSaslRpcClientHandler.java | 23 +-
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 16 +-
.../snapshot/ClientSnapshotDescriptionUtils.java | 8 +-
hbase-endpoint/pom.xml | 4 -
.../hadoop/hbase/coprocessor/TestSecureExport.java | 3 +-
hbase-examples/pom.xml | 4 -
.../ShadeSaslClientAuthenticationProvider.java | 6 +
.../ShadeSaslServerAuthenticationProvider.java | 1 -
.../java/org/apache/hadoop/hbase/types/PBCell.java | 18 +-
.../java/org/apache/hadoop/hbase/types/PBType.java | 20 +-
.../src/main/protobuf/CellMessage.proto | 6 +-
.../TestShadeSaslAuthenticationProvider.java | 109 +-
.../org/apache/hadoop/hbase/types/TestPBCell.java | 30 +-
hbase-it/pom.xml | 4 -
hbase-mapreduce/pom.xml | 12 -
.../hadoop/hbase/mapreduce/TableMapReduceUtil.java | 25 +-
.../hadoop/hbase/mapreduce/TestImportExport.java | 4 +-
.../TestImportTSVWithVisibilityLabels.java | 3 +-
.../hbase/mapreduce/TestTimeRangeMapRed.java | 2 +-
hbase-protocol/README.txt | 13 -
hbase-protocol/pom.xml | 216 ---
.../google/protobuf/HBaseZeroCopyByteString.java | 77 -
.../org/apache/hadoop/hbase/util/ByteStringer.java | 69 -
.../src/main/protobuf/AccessControl.proto | 140 --
hbase-protocol/src/main/protobuf/Admin.proto | 310 ----
.../src/main/protobuf/Authentication.proto | 83 -
hbase-protocol/src/main/protobuf/Cell.proto | 69 -
hbase-protocol/src/main/protobuf/Client.proto | 550 ------
hbase-protocol/src/main/protobuf/ClusterId.proto | 35 -
.../src/main/protobuf/ClusterStatus.proto | 283 ---
hbase-protocol/src/main/protobuf/Comparator.proto | 84 -
hbase-protocol/src/main/protobuf/Encryption.proto | 34 -
.../src/main/protobuf/ErrorHandling.proto | 59 -
hbase-protocol/src/main/protobuf/FS.proto | 46 -
hbase-protocol/src/main/protobuf/Filter.proto | 179 --
hbase-protocol/src/main/protobuf/HBase.proto | 254 ---
hbase-protocol/src/main/protobuf/HFile.proto | 50 -
.../src/main/protobuf/LoadBalancer.proto | 30 -
hbase-protocol/src/main/protobuf/MapReduce.proto | 38 -
.../src/main/protobuf/MultiRowMutation.proto | 48 -
.../src/main/protobuf/PingProtocol.proto | 68 -
hbase-protocol/src/main/protobuf/Quota.proto | 113 --
hbase-protocol/src/main/protobuf/RPC.proto | 138 --
hbase-protocol/src/main/protobuf/RSGroup.proto | 34 -
.../src/main/protobuf/RSGroupAdmin.proto | 158 --
.../src/main/protobuf/RowProcessor.proto | 47 -
hbase-protocol/src/main/protobuf/Snapshot.proto | 67 -
.../src/main/protobuf/TestProcedure.proto | 26 -
hbase-protocol/src/main/protobuf/Tracing.proto | 34 -
.../src/main/protobuf/VisibilityLabels.proto | 84 -
hbase-protocol/src/main/protobuf/WAL.proto | 177 --
hbase-protocol/src/main/protobuf/ZooKeeper.proto | 147 --
hbase-protocol/src/main/protobuf/test.proto | 44 -
.../src/main/protobuf/test_rpc_service.proto | 37 -
.../apache/hadoop/hbase/rest/model/CellModel.java | 10 +-
hbase-server/pom.xml | 7 -
.../hbase/tmpl/master/MasterStatusTmpl.jamon | 1 -
.../tmpl/regionserver/ServerMetricsTmpl.jamon | 3 -
.../hadoop/hbase/ipc/ServerRpcConnection.java | 2 +-
.../hbase/snapshot/SnapshotDescriptionUtils.java | 5 +-
.../hadoop/hbase/wal/RegionGroupingProvider.java | 6 +-
.../hbase/TestPartialResultsFromClientSide.java | 2 +-
.../hbase/client/TestAsyncRegionAdminApi.java | 13 +-
.../hbase/client/TestBlockEvictionFromClient.java | 11 +-
.../hadoop/hbase/client/TestFromClientSide.java | 8 +-
.../hadoop/hbase/client/TestFromClientSide5.java | 2 +-
.../hbase/client/TestScannersFromClientSide.java | 4 +-
.../hadoop/hbase/client/TestTimestampsFilter.java | 2 +-
.../hbase/filter/TestColumnPrefixFilter.java | 4 +-
.../hadoop/hbase/filter/TestColumnRangeFilter.java | 2 +-
.../filter/TestFilterListOrOperatorWithBlkCnt.java | 4 +-
.../filter/TestMultipleColumnPrefixFilter.java | 8 +-
.../hadoop/hbase/protobuf/TestProtobufUtil.java | 383 -----
.../hbase/protobuf/TestReplicationProtobuf.java | 3 +-
.../hbase/regionserver/TestColumnSeeking.java | 4 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 2 +-
.../hadoop/hbase/regionserver/TestKeepDeletes.java | 16 +-
.../TestNewVersionBehaviorFromClientSide.java | 6 +-
.../TestVisibilityLabelsWithSLGStack.java | 3 +-
hbase-testing-util/pom.xml | 6 -
hbase-thrift/pom.xml | 4 -
.../TestThriftHBaseServiceHandlerWithLabels.java | 3 +-
pom.xml | 20 +-
97 files changed, 396 insertions(+), 6353 deletions(-)
delete mode 100644 hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
copy hbase-protocol-shaded/src/main/protobuf/TableListMessage.proto => hbase-examples/src/main/protobuf/CellMessage.proto (88%)
delete mode 100644 hbase-protocol/README.txt
delete mode 100644 hbase-protocol/pom.xml
delete mode 100644 hbase-protocol/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java
delete mode 100644 hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java
delete mode 100644 hbase-protocol/src/main/protobuf/AccessControl.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Admin.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Authentication.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Cell.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Client.proto
delete mode 100644 hbase-protocol/src/main/protobuf/ClusterId.proto
delete mode 100644 hbase-protocol/src/main/protobuf/ClusterStatus.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Comparator.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Encryption.proto
delete mode 100644 hbase-protocol/src/main/protobuf/ErrorHandling.proto
delete mode 100644 hbase-protocol/src/main/protobuf/FS.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Filter.proto
delete mode 100644 hbase-protocol/src/main/protobuf/HBase.proto
delete mode 100644 hbase-protocol/src/main/protobuf/HFile.proto
delete mode 100644 hbase-protocol/src/main/protobuf/LoadBalancer.proto
delete mode 100644 hbase-protocol/src/main/protobuf/MapReduce.proto
delete mode 100644 hbase-protocol/src/main/protobuf/MultiRowMutation.proto
delete mode 100644 hbase-protocol/src/main/protobuf/PingProtocol.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Quota.proto
delete mode 100644 hbase-protocol/src/main/protobuf/RPC.proto
delete mode 100644 hbase-protocol/src/main/protobuf/RSGroup.proto
delete mode 100644 hbase-protocol/src/main/protobuf/RSGroupAdmin.proto
delete mode 100644 hbase-protocol/src/main/protobuf/RowProcessor.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Snapshot.proto
delete mode 100644 hbase-protocol/src/main/protobuf/TestProcedure.proto
delete mode 100644 hbase-protocol/src/main/protobuf/Tracing.proto
delete mode 100644 hbase-protocol/src/main/protobuf/VisibilityLabels.proto
delete mode 100644 hbase-protocol/src/main/protobuf/WAL.proto
delete mode 100644 hbase-protocol/src/main/protobuf/ZooKeeper.proto
delete mode 100644 hbase-protocol/src/main/protobuf/test.proto
delete mode 100644 hbase-protocol/src/main/protobuf/test_rpc_service.proto
delete mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
[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 6dbd7de72b80e480b2e53134b8c9b66bc7fcfb71
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 4f8b5c8..84388f4 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 :(
@@ -658,6 +658,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