You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by md...@apache.org on 2018/04/16 17:00:43 UTC
[1/2] hbase git commit: HBASE-19963 TestFSHDFSUtils assumes wrong
default port for Hadoop 3.0.1+
Repository: hbase
Updated Branches:
refs/heads/branch-2 f73986d11 -> ecd9914dc
refs/heads/master 773aff90f -> 44ebd2809
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/ecd9914d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ecd9914d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ecd9914d
Branch: refs/heads/branch-2
Commit: ecd9914dc991df518d41b6748590cace7d768c4e
Parents: f73986d
Author: Wei-Chiu Chuang <we...@cloudera.com>
Authored: Tue Apr 10 19:44:37 2018 -0700
Committer: Mike Drob <md...@apache.org>
Committed: Mon Apr 16 12:00:08 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/ecd9914d/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);
}
}
[2/2] hbase git commit: HBASE-19963 TestFSHDFSUtils assumes wrong
default port for Hadoop 3.0.1+
Posted by md...@apache.org.
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/44ebd280
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/44ebd280
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/44ebd280
Branch: refs/heads/master
Commit: 44ebd2809384559c3edad5c9bf78b973cb8d590a
Parents: 773aff9
Author: Wei-Chiu Chuang <we...@cloudera.com>
Authored: Tue Apr 10 19:44:37 2018 -0700
Committer: Mike Drob <md...@apache.org>
Committed: Mon Apr 16 12:00:17 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/44ebd280/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 795e5d1..0390199 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);
}
}