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

HDFS-3614. Revert unused MiniDFSCluster constructor from HDFS-3049. Contributed by Arun Murthy 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1358825 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-07-08 19:53:14 +00:00
parent 21fdf16b0d
commit 5952c7bb62
2 changed files with 9 additions and 7 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

@ -180,6 +180,9 @@ Trunk (unreleased changes)
HDFS-3482. hdfs balancer throws ArrayIndexOutOfBoundsException HDFS-3482. hdfs balancer throws ArrayIndexOutOfBoundsException
if option is specified without values. ( Madhukara Phatak via umamahesh) if option is specified without values. ( Madhukara Phatak via umamahesh)
HDFS-3614. Revert unused MiniDFSCluster constructor from HDFS-3049.
(acmurthy via eli)
Branch-2 ( Unreleased changes ) Branch-2 ( Unreleased changes )
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

13
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
View File

@ -392,7 +392,7 @@ public class MiniDFSCluster {
public MiniDFSCluster(Configuration conf, public MiniDFSCluster(Configuration conf,
int numDataNodes, int numDataNodes,
StartupOption nameNodeOperation) throws IOException { StartupOption nameNodeOperation) throws IOException {
this(0, conf, numDataNodes, false, false, false, false, nameNodeOperation, this(0, conf, numDataNodes, false, false, false, nameNodeOperation,
null, null, null); null, null, null);
} }
@ -414,7 +414,7 @@ public class MiniDFSCluster {
int numDataNodes, int numDataNodes,
boolean format, boolean format,
String[] racks) throws IOException { String[] racks) throws IOException {
this(0, conf, numDataNodes, format, true, true, true, null, this(0, conf, numDataNodes, format, true, true, null,
racks, null, null); racks, null, null);
} }
@ -437,7 +437,7 @@ public class MiniDFSCluster {
int numDataNodes, int numDataNodes,
boolean format, boolean format,
String[] racks, String[] hosts) throws IOException { String[] racks, String[] hosts) throws IOException {
this(0, conf, numDataNodes, format, true, true, true, null, this(0, conf, numDataNodes, format, true, true, null,
racks, hosts, null); racks, hosts, null);
} }
@ -472,7 +472,7 @@ public class MiniDFSCluster {
StartupOption operation, StartupOption operation,
String[] racks) throws IOException { String[] racks) throws IOException {
this(nameNodePort, conf, numDataNodes, format, manageDfsDirs, this(nameNodePort, conf, numDataNodes, format, manageDfsDirs,
manageDfsDirs, manageDfsDirs, operation, racks, null, null); manageDfsDirs, operation, racks, null, null);
} }
/** /**
@ -505,7 +505,7 @@ public class MiniDFSCluster {
StartupOption operation, StartupOption operation,
String[] racks, String[] racks,
long[] simulatedCapacities) throws IOException { long[] simulatedCapacities) throws IOException {
this(nameNodePort, conf, numDataNodes, format, manageDfsDirs, manageDfsDirs, this(nameNodePort, conf, numDataNodes, format, manageDfsDirs,
manageDfsDirs, operation, racks, null, simulatedCapacities); manageDfsDirs, operation, racks, null, simulatedCapacities);
} }
@ -540,14 +540,13 @@ public class MiniDFSCluster {
int numDataNodes, int numDataNodes,
boolean format, boolean format,
boolean manageNameDfsDirs, boolean manageNameDfsDirs,
boolean enableManagedDfsDirsRedundancy,
boolean manageDataDfsDirs, boolean manageDataDfsDirs,
StartupOption operation, StartupOption operation,
String[] racks, String hosts[], String[] racks, String hosts[],
long[] simulatedCapacities) throws IOException { long[] simulatedCapacities) throws IOException {
this.nameNodes = new NameNodeInfo[1]; // Single namenode in the cluster this.nameNodes = new NameNodeInfo[1]; // Single namenode in the cluster
initMiniDFSCluster(conf, numDataNodes, format, initMiniDFSCluster(conf, numDataNodes, format,
manageNameDfsDirs, true, enableManagedDfsDirsRedundancy, manageDataDfsDirs, manageNameDfsDirs, true, manageDataDfsDirs, manageDataDfsDirs,
operation, racks, hosts, operation, racks, hosts,
simulatedCapacities, null, true, false, simulatedCapacities, null, true, false,
MiniDFSNNTopology.simpleSingleNN(nameNodePort, 0)); MiniDFSNNTopology.simpleSingleNN(nameNodePort, 0));