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

Merge r1576035 from trunk.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576036 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-03-10 18:18:52 +00:00
parent 8d6fb7e920
commit c3c267af8f
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,8 @@ Release 2.4.0 - UNRELEASED
HDFS-6071. BlockReaderLocal doesn't return -1 on EOF when doing a HDFS-6071. BlockReaderLocal doesn't return -1 on EOF when doing a
zero-length read on a short file (cmccabe) 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 BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

15
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSNNTopology.java
View File

@ -77,6 +77,21 @@ public static MiniDFSNNTopology simpleFederatedTopology(
return topology; 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 * Set up federated cluster with the given number of nameservices, each
* of which has two NameNodes. * of which has two NameNodes.

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDeleteBlockPool.java
View File

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