HBASE-19963 TestFSHDFSUtils assumes wrong default port for Hadoop 3.0.1+

Signed-off-by: Mike Drob <mdrob@apache.org>
This commit is contained in:
Wei-Chiu Chuang 2018-04-10 19:44:37 -07:00 committed by Mike Drob
parent 773aff90fd
commit 44ebd28093

View File

@ -152,12 +152,14 @@ public class TestFSHDFSUtils {
public void testIsSameHdfs() throws IOException { public void testIsSameHdfs() throws IOException {
String hadoopVersion = org.apache.hadoop.util.VersionInfo.getVersion(); String hadoopVersion = org.apache.hadoop.util.VersionInfo.getVersion();
LOG.info("hadoop version is: " + hadoopVersion); LOG.info("hadoop version is: " + hadoopVersion);
boolean isHadoop3 = hadoopVersion.startsWith("3."); boolean isHadoop3_0_0 = hadoopVersion.startsWith("3.0.0");
if (isHadoop3) { if (isHadoop3_0_0) {
// Hadoop 3.0.0 alpha1+ change default nn port to 9820. See HDFS-9427 // Hadoop 3.0.0 alpha1+ ~ 3.0.0 GA changed default nn port to 9820.
// See HDFS-9427
testIsSameHdfs(9820); testIsSameHdfs(9820);
} else { } else {
// pre hadoop 3.0.0 defaults to port 8020 // pre hadoop 3.0.0 defaults to port 8020
// Hadoop 3.0.1 changed it back to port 8020. See HDFS-12990
testIsSameHdfs(8020); testIsSameHdfs(8020);
} }
} }