Browse Source

HDFS-9224. TestFileTruncate fails intermittently with BindException (Contributed by Brahma Reddy Battula)

(cherry picked from commit 69b025dbbaa44395e49d1c04b90e1f65f0fc1132)
Vinayakumar B 9 years ago
parent
commit
50253c43f0

+ 3 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -1201,6 +1201,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9222. Add hadoop-hdfs-client as a dependency of
     HDFS-9222. Add hadoop-hdfs-client as a dependency of
     hadoop-hdfs-native-client. (Mingliang Liu via wheat9)
     hadoop-hdfs-native-client. (Mingliang Liu via wheat9)
 
 
+    HDFS-9224. TestFileTruncate fails intermittently with BindException
+    (Brahma Reddy Battula via vinayakumarb)
+
 Release 2.7.2 - UNRELEASED
 Release 2.7.2 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 4 - 1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java

@@ -58,6 +58,7 @@ import org.apache.hadoop.hdfs.protocol.LocatedBlock;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
 import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
+import org.apache.hadoop.net.ServerSocketUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.test.GenericTestUtils;
 import org.apache.hadoop.util.Time;
 import org.apache.hadoop.util.Time;
@@ -1226,7 +1227,9 @@ public class TestFileTruncate {
       NameNode.doRollback(conf, false);
       NameNode.doRollback(conf, false);
     cluster = new MiniDFSCluster.Builder(conf).numDataNodes(DATANODE_NUM)
     cluster = new MiniDFSCluster.Builder(conf).numDataNodes(DATANODE_NUM)
         .format(false)
         .format(false)
-        .nameNodePort(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)
+        .nameNodePort(
+            ServerSocketUtil.getPort(
+                HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT, 10))
         .startupOption(o==StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .startupOption(o==StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .dnStartupOption(o!=StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .dnStartupOption(o!=StartupOption.ROLLBACK ? StartupOption.REGULAR : o)
         .build();
         .build();