|
@@ -50,7 +50,6 @@ import org.apache.hadoop.hdfs.DFSTestUtil;
|
|
|
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;
|
|
@@ -59,7 +58,6 @@ import org.apache.hadoop.hdfs.protocol.LocatedBlocks;
|
|
|
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;
|
|
@@ -103,7 +101,6 @@ public class TestFileTruncate {
|
|
|
cluster = new MiniDFSCluster.Builder(conf)
|
|
|
.format(true)
|
|
|
.numDataNodes(DATANODE_NUM)
|
|
|
- .nameNodePort(HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)
|
|
|
.waitSafeMode(true)
|
|
|
.build();
|
|
|
fs = cluster.getFileSystem();
|
|
@@ -1228,9 +1225,6 @@ public class TestFileTruncate {
|
|
|
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();
|