From c3c267af8f6a38154103c6f3b49c93fd2adc7267 Mon Sep 17 00:00:00 2001
From: Haohui Mai <wheat9@apache.org>
Date: Mon, 10 Mar 2014 18:18:52 +0000
Subject: [PATCH] Merge r1576035 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576036 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt       |  2 ++
 .../org/apache/hadoop/hdfs/MiniDFSNNTopology.java | 15 +++++++++++++++
 .../hdfs/server/datanode/TestDeleteBlockPool.java |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 88e5dd76cf5..8d2b35b1001 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -337,6 +337,8 @@ Release 2.4.0 - UNRELEASED
     HDFS-6071. BlockReaderLocal doesn't return -1 on EOF when doing a
     zero-length read on a short file (cmccabe)
 
+    HDFS-5892. TestDeleteBlockPool fails in branch-2. (Ted Yu via wheat9)
+
   BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
 
     HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java
index 4dfbfd81d95..4c1eff89a42 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java
@@ -77,6 +77,21 @@ public static MiniDFSNNTopology simpleFederatedTopology(
     return topology;
   }
 
+  /**
+   * Set up federated cluster with the given nameservices, each
+   * of which has only a single NameNode.
+   */
+  public static MiniDFSNNTopology simpleFederatedTopology(String nameservicesIds) {
+    MiniDFSNNTopology topology = new MiniDFSNNTopology();
+    String nsIds[] = nameservicesIds.split(",");
+    for (String nsId : nsIds) {
+      topology.addNameservice(new MiniDFSNNTopology.NSConf(nsId)
+        .addNN(new MiniDFSNNTopology.NNConf(null)));
+    }
+    topology.setFederation(true);
+    return topology;
+  }
+
   /**
    * Set up federated cluster with the given number of nameservices, each
    * of which has two NameNodes.
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java
index 4e4df657ded..cbe452dcee0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java
@@ -50,7 +50,8 @@ public void testDeleteBlockPool() 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(2).build();
 
       cluster.waitActive();