Repository: hbase Updated Branches: refs/heads/branch-2.0 bbe15510e -> 10a290591
HBASE-19963 TestFSHDFSUtils assumes wrong default port for Hadoop 3.0.1+ Signed-off-by: Mike Drob <md...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/10a29059 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/10a29059 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/10a29059 Branch: refs/heads/branch-2.0 Commit: 10a29059160ba0e56e7d86844fdb33a9874b9e4c Parents: bbe1551 Author: Wei-Chiu Chuang <weic...@cloudera.com> Authored: Tue Apr 10 19:44:37 2018 -0700 Committer: Mike Drob <md...@apache.org> Committed: Mon Apr 16 12:01:23 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/10a29059/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java index d500cf9..e88dd5f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java @@ -152,12 +152,14 @@ public class TestFSHDFSUtils { public void testIsSameHdfs() throws IOException { String hadoopVersion = org.apache.hadoop.util.VersionInfo.getVersion(); LOG.info("hadoop version is: " + hadoopVersion); - boolean isHadoop3 = hadoopVersion.startsWith("3."); - if (isHadoop3) { - // Hadoop 3.0.0 alpha1+ change default nn port to 9820. See HDFS-9427 + boolean isHadoop3_0_0 = hadoopVersion.startsWith("3.0.0"); + if (isHadoop3_0_0) { + // Hadoop 3.0.0 alpha1+ ~ 3.0.0 GA changed default nn port to 9820. + // See HDFS-9427 testIsSameHdfs(9820); } else { // pre hadoop 3.0.0 defaults to port 8020 + // Hadoop 3.0.1 changed it back to port 8020. See HDFS-12990 testIsSameHdfs(8020); } }