HDFS-9407. TestFileTruncate should not use fixed NN port. Contributed…

… by Brahma Reddy Battula.
vdinkumar · Nov 25, 2015 · fc799ab · fc799ab
1 parent e3d6739
commit fc799ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2378,8 +2378,8 @@ Release 2.8.0 - UNRELEASED
     HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently.
     (Rakesh R via waltersu4549)
 
-    HDFS-9433. DFS getEZForPath API on a non-existent file should throw FileNotFoundException
-    (Rakesh R via umamahesh)
+    HDFS-9433. DFS getEZForPath API on a non-existent file should throw
+    FileNotFoundException (Rakesh R via umamahesh)
 
     HDFS-6101. TestReplaceDatanodeOnFailure fails occasionally.
     (Wei-Chiu Chuang via cnauroth)
@@ -2397,6 +2397,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9459. hadoop-hdfs-native-client fails test build on Windows after
     transition to ctest. (Chris Nauroth via wheat9)
 
+    HDFS-9407. TestFileTruncate should not use fixed NN port.
+    (Brahma Reddy Battula via shv)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

diff --git a/...ct/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java b/...ct/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
@@ -50,7 +50,6 @@
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
 import org.apache.hadoop.hdfs.protocol.Block;
 import org.apache.hadoop.hdfs.protocol.HdfsConstants;
 import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
@@ -60,7 +59,6 @@
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.datanode.FsDatasetTestUtils;
-import org.apache.hadoop.net.ServerSocketUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.Time;
@@ -104,7 +102,6 @@ public void setUp() throws IOException {
     cluster = new MiniDFSCluster.Builder(conf)
         .format(true)
         .numDataNodes(DATANODE_NUM)
-        .nameNodePort(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)
         .waitSafeMode(true)
         .build();
     fs = cluster.getFileSystem();
@@ -1230,9 +1227,6 @@ static void restartCluster(StartupOption o)
       NameNode.doRollback(conf, false);
     cluster = new MiniDFSCluster.Builder(conf).numDataNodes(DATANODE_NUM)
         .format(false)
-        .nameNodePort(
-            ServerSocketUtil.getPort(
-                HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, 10))
         .startupOption(o==StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .dnStartupOption(o!=StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .build();