From 39aeb3bdd44364ee3a779e0289b56795977dab87 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Mon, 13 May 2019 10:30:13 +0800 Subject: [PATCH] HBASE-22413 Backport 'HBASE-22399 Change default hadoop-two.version to 2.8.x and remove the 2.7.x hadoop checks' to branch-1 --- dev-support/docker/Dockerfile | 2 +- dev-support/hbase-personality.sh | 20 ++++++++++++------- .../client/TestReversedScannerCallable.java | 5 +---- pom.xml | 14 +++++++++++-- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 0ba8a8d498..c605eaa572 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -19,7 +19,7 @@ # See BUILDING.txt. -FROM ubuntu:trusty +FROM ubuntu:bionic WORKDIR /root diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 7f930d0dc4..4124b02237 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -488,27 +488,33 @@ function hadoopcheck_rebuild # All supported Hadoop versions that we want to test the compilation with # See the Hadoop section on prereqs in the HBase Reference Guide - hbase_common_hadoop2_versions="2.7.1 2.7.2 2.7.3 2.7.4" if [[ "${PATCH_BRANCH}" = branch-1.* ]] && [[ "${PATCH_BRANCH#branch-1.}" -lt "5" ]]; then yetus_info "Setting Hadoop 2 versions to test based on before-branch-1.5 rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then - hbase_hadoop2_versions="2.4.1 2.5.2 2.6.5 2.7.4" + hbase_hadoop2_versions="2.4.1 2.5.2 2.6.5 2.7.7" else - hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 ${hbase_common_hadoop2_versions}" + hbase_hadoop2_versions="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7" fi elif [[ "${PATCH_BRANCH}" = branch-2.0 ]]; then yetus_info "Setting Hadoop 2 versions to test based on branch-2.0 rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then - hbase_hadoop2_versions="2.6.5 2.7.4" + hbase_hadoop2_versions="2.6.5 2.7.7 2.8.5" else - hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 ${hbase_common_hadoop2_versions}" + hbase_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 2.8.2 2.8.3 2.8.4 2.8.5" + fi + elif [[ "${PATCH_BRANCH}" = branch-2.1 ]]; then + yetus_info "Setting Hadoop 2 versions to test based on branch-2.1 rules." + if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then + hbase_hadoop2_versions="2.7.7 2.8.5" + else + hbase_hadoop2_versions="2.7.1 2.7.2 2.7.3 2.7.4 2.7.5 2.7.6 2.7.7 2.8.2 2.8.3 2.8.4 2.8.5" fi else yetus_info "Setting Hadoop 2 versions to test based on branch-1.5+/branch-2.1+/master/feature branch rules." if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then - hbase_hadoop2_versions="2.7.4" + hbase_hadoop2_versions="2.8.5 2.9.2" else - hbase_hadoop2_versions="${hbase_common_hadoop2_versions}" + hbase_hadoop2_versions="2.8.2 2.8.3 2.8.4 2.8.5 2.9.1 2.9.2" fi fi hbase_hadoop3_versions="3.0.0" diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestReversedScannerCallable.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestReversedScannerCallable.java index 6c2d0a6b23..5ef7ce4993 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestReversedScannerCallable.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestReversedScannerCallable.java @@ -52,14 +52,11 @@ public class TestReversedScannerCallable { @Before public void setUp() throws Exception { - byte[] ROW_BEFORE = ConnectionUtils.createCloseRowBefore(ROW); - - Configuration conf = Mockito.mock(Configuration.class); HRegionLocation regionLocation = Mockito.mock(HRegionLocation.class); ServerName serverName = Mockito.mock(ServerName.class); HRegionInfo regionInfo = Mockito.mock(HRegionInfo.class); - Mockito.when(connection.getConfiguration()).thenReturn(conf); + Mockito.when(connection.getConfiguration()).thenReturn(new Configuration()); Mockito.when(regionLocations.size()).thenReturn(1); Mockito.when(regionLocations.getRegionLocation(0)).thenReturn(regionLocation); Mockito.when(regionLocation.getHostname()).thenReturn("localhost"); diff --git a/pom.xml b/pom.xml index 1f3db19aa4..3fa579c495 100644 --- a/pom.xml +++ b/pom.xml @@ -1249,7 +1249,7 @@ 3.0.3 ${compileSource} - 2.7.4 + 2.8.5 ${hadoop-two.version} 3.0.0 @@ -2273,7 +2273,17 @@ org.apache.hadoop hadoop-auth - ${hadoop-two.version} + ${hadoop-two.version} + + + com.google.guava + guava + + + net.minidev + json-smart + + org.apache.hadoop -- 2.17.1