Author: wheat9 Date: Mon Mar 10 18:16:57 2014 New Revision: 1576035 URL: http://svn.apache.org/r1576035 Log: HDFS-5892. TestDeleteBlockPool fails in branch-2. Contributed by Ted Yu.
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1576035&r1=1576034&r2=1576035&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Mar 10 18:16:57 2014 @@ -732,6 +732,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) Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java?rev=1576035&r1=1576034&r2=1576035&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java Mon Mar 10 18:16:57 2014 @@ -78,6 +78,21 @@ public class MiniDFSNNTopology { } /** + * 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. */ Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java?rev=1576035&r1=1576034&r2=1576035&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java Mon Mar 10 18:16:57 2014 @@ -50,7 +50,8 @@ public class TestDeleteBlockPool { 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();