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

HDFS-6443: Merging r1597238 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-05-24 05:09:39 +00:00
parent 2994e2ac96
commit 2fe6e4ccfe
3 changed files with 56 additions and 39 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

@ -271,6 +271,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6423. Diskspace quota usage should be updated when appending data to HDFS-6423. Diskspace quota usage should be updated when appending data to
partial block. (jing9) partial block. (jing9)
HDFS-6443. Fix MiniQJMHACluster related test failures. (Zesheng Wu via
Arpit Agarwal)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

90
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java
View File

@ -22,8 +22,12 @@
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY;
import java.io.IOException; import java.io.IOException;
import java.net.BindException;
import java.net.URI; import java.net.URI;
import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.DFSUtil;
@ -37,14 +41,13 @@ public class MiniQJMHACluster {
private MiniDFSCluster cluster; private MiniDFSCluster cluster;
private MiniJournalCluster journalCluster; private MiniJournalCluster journalCluster;
private final Configuration conf; private final Configuration conf;
private static final Log LOG = LogFactory.getLog(MiniQJMHACluster.class);
public static final String NAMESERVICE = "ns1"; public static final String NAMESERVICE = "ns1";
private static final String NN1 = "nn1"; private static final String NN1 = "nn1";
private static final String NN2 = "nn2"; private static final String NN2 = "nn2";
private static final int NN1_IPC_PORT = 10000; private static final Random RANDOM = new Random();
private static final int NN1_INFO_PORT = 10001; private int basePort = 10000;
private static final int NN2_IPC_PORT = 10002;
private static final int NN2_INFO_PORT = 10003;
public static class Builder { public static class Builder {
private final Configuration conf; private final Configuration conf;
@ -69,51 +72,62 @@ public void startupOption(StartupOption startOpt) {
} }
} }
public static MiniDFSNNTopology createDefaultTopology() { public static MiniDFSNNTopology createDefaultTopology(int basePort) {
return new MiniDFSNNTopology() return new MiniDFSNNTopology()
.addNameservice(new MiniDFSNNTopology.NSConf(NAMESERVICE).addNN( .addNameservice(new MiniDFSNNTopology.NSConf(NAMESERVICE).addNN(
new MiniDFSNNTopology.NNConf("nn1").setIpcPort(NN1_IPC_PORT) new MiniDFSNNTopology.NNConf("nn1").setIpcPort(basePort)
.setHttpPort(NN1_INFO_PORT)).addNN( .setHttpPort(basePort + 1)).addNN(
new MiniDFSNNTopology.NNConf("nn2").setIpcPort(NN2_IPC_PORT) new MiniDFSNNTopology.NNConf("nn2").setIpcPort(basePort + 2)
.setHttpPort(NN2_INFO_PORT))); .setHttpPort(basePort + 3)));
} }
private MiniQJMHACluster(Builder builder) throws IOException { private MiniQJMHACluster(Builder builder) throws IOException {
this.conf = builder.conf; this.conf = builder.conf;
// start 3 journal nodes int retryCount = 0;
journalCluster = new MiniJournalCluster.Builder(conf).format(true) while (true) {
.build(); try {
URI journalURI = journalCluster.getQuorumJournalURI(NAMESERVICE); basePort = 10000 + RANDOM.nextInt(1000) * 4;
// start 3 journal nodes
// start cluster with 2 NameNodes journalCluster = new MiniJournalCluster.Builder(conf).format(true)
MiniDFSNNTopology topology = createDefaultTopology(); .build();
URI journalURI = journalCluster.getQuorumJournalURI(NAMESERVICE);
initHAConf(journalURI, builder.conf);
// start cluster with 2 NameNodes
// First start up the NNs just to format the namespace. The MinIDFSCluster MiniDFSNNTopology topology = createDefaultTopology(basePort);
// has no way to just format the NameNodes without also starting them.
cluster = builder.dfsBuilder.nnTopology(topology) initHAConf(journalURI, builder.conf);
.manageNameDfsSharedDirs(false).build();
cluster.waitActive(); // First start up the NNs just to format the namespace. The MinIDFSCluster
cluster.shutdown(); // has no way to just format the NameNodes without also starting them.
cluster = builder.dfsBuilder.nnTopology(topology)
// initialize the journal nodes .manageNameDfsSharedDirs(false).build();
Configuration confNN0 = cluster.getConfiguration(0); cluster.waitActive();
NameNode.initializeSharedEdits(confNN0, true); cluster.shutdown();
cluster.getNameNodeInfos()[0].setStartOpt(builder.startOpt); // initialize the journal nodes
cluster.getNameNodeInfos()[1].setStartOpt(builder.startOpt); Configuration confNN0 = cluster.getConfiguration(0);
NameNode.initializeSharedEdits(confNN0, true);
// restart the cluster
cluster.restartNameNodes(); cluster.getNameNodeInfos()[0].setStartOpt(builder.startOpt);
cluster.getNameNodeInfos()[1].setStartOpt(builder.startOpt);
// restart the cluster
cluster.restartNameNodes();
++retryCount;
break;
} catch (BindException e) {
LOG.info("MiniQJMHACluster port conflicts, retried " +
retryCount + " times");
}
}
} }
private Configuration initHAConf(URI journalURI, Configuration conf) { private Configuration initHAConf(URI journalURI, Configuration conf) {
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY, conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
journalURI.toString()); journalURI.toString());
String address1 = "127.0.0.1:" + NN1_IPC_PORT; String address1 = "127.0.0.1:" + basePort;
String address2 = "127.0.0.1:" + NN2_IPC_PORT; String address2 = "127.0.0.1:" + (basePort + 2);
conf.set(DFSUtil.addKeySuffixes(DFS_NAMENODE_RPC_ADDRESS_KEY, conf.set(DFSUtil.addKeySuffixes(DFS_NAMENODE_RPC_ADDRESS_KEY,
NAMESERVICE, NN1), address1); NAMESERVICE, NN1), address1);
conf.set(DFSUtil.addKeySuffixes(DFS_NAMENODE_RPC_ADDRESS_KEY, conf.set(DFSUtil.addKeySuffixes(DFS_NAMENODE_RPC_ADDRESS_KEY,

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
View File

@ -104,7 +104,7 @@ public void setUpCluster() throws Exception {
HAUtil.setAllowStandbyReads(conf, true); HAUtil.setAllowStandbyReads(conf, true);
if (clusterType == TestType.SHARED_DIR_HA) { if (clusterType == TestType.SHARED_DIR_HA) {
MiniDFSNNTopology topology = MiniQJMHACluster.createDefaultTopology(); MiniDFSNNTopology topology = MiniQJMHACluster.createDefaultTopology(10000);
cluster = new MiniDFSCluster.Builder(conf) cluster = new MiniDFSCluster.Builder(conf)
.nnTopology(topology) .nnTopology(topology)
.numDataNodes(0) .numDataNodes(0)