Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-5213. TestDataNodeConfig failing on Jenkins runs due to DN web port in use. (wang) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589477 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2014-04-23 18:09:34 +00:00
parent f4bba31c92
commit db667639eb
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -119,6 +119,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6178. Decommission on standby NN couldn't finish. (Ming Ma via jing9)
HDFS-6213. TestDataNodeConfig failing on Jenkins runs due to DN web port
in use. (wang)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

12
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeConfig.java
View File

@ -51,6 +51,8 @@ public class TestDatanodeConfig {
public static void setUp() throws Exception {
clearBaseDir();
Configuration conf = new HdfsConfiguration();
conf.setInt(DFSConfigKeys.DFS_DATANODE_HTTPS_PORT_KEY, 0);
conf.set(DFSConfigKeys.DFS_DATANODE_ADDRESS_KEY, "localhost:0");
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0).build();
cluster.waitActive();
}
@ -100,8 +102,14 @@ public class TestDatanodeConfig {
String dnDir3 = dataDir.getAbsolutePath() + "3";
conf.set(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY,
dnDir1 + "," + dnDir2 + "," + dnDir3);
cluster.startDataNodes(conf, 1, false, StartupOption.REGULAR, null);
assertTrue("Data-node should startup.", cluster.isDataNodeUp());
try {
cluster.startDataNodes(conf, 1, false, StartupOption.REGULAR, null);
assertTrue("Data-node should startup.", cluster.isDataNodeUp());
} finally {
if (cluster != null) {
cluster.shutdownDataNodes();
}
}
}
private static String makeURI(String scheme, String host, String path)