HDFS-6612. MiniDFSNNTopology#simpleFederatedTopology(int) always hardcode nameservice ID. Contributed by Juan Yu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Wang 2014-07-02 18:37:00 +00:00
parent d1f54f4f4b
commit 9dfe9cf400
3 changed files with 7 additions and 2 deletions

View File

@ -484,6 +484,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6603. Add XAttr with ACL test. (Stephen Chu via cnauroth)
HDFS-6612. MiniDFSNNTopology#simpleFederatedTopology(int)
always hardcode nameservice ID. (Juan Yu via wang)
OPTIMIZATIONS
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)

View File

@ -160,7 +160,8 @@ public void testDfsAdminDeleteBlockPool() throws Exception {
conf.set(DFSConfigKeys.DFS_NAMESERVICES,
"namesServerId1,namesServerId2");
cluster = new MiniDFSCluster.Builder(conf)
.nnTopology(MiniDFSNNTopology.simpleFederatedTopology(2))
.nnTopology(MiniDFSNNTopology.simpleFederatedTopology(
conf.get(DFSConfigKeys.DFS_NAMESERVICES)))
.numDataNodes(1).build();
cluster.waitActive();

View File

@ -1334,7 +1334,8 @@ public void testMultipleSecondaryNamenodes() throws IOException {
SecondaryNameNode secondary2 = null;
try {
cluster = new MiniDFSCluster.Builder(conf)
.nnTopology(MiniDFSNNTopology.simpleFederatedTopology(2))
.nnTopology(MiniDFSNNTopology.simpleFederatedTopology(
conf.get(DFSConfigKeys.DFS_NAMESERVICES)))
.build();
Configuration snConf1 = new HdfsConfiguration(cluster.getConfiguration(0));
Configuration snConf2 = new HdfsConfiguration(cluster.getConfiguration(1));