Author: eli
Date: Sun Jul 8 19:53:14 2012
New Revision: 1358825
URL: http://svn.apache.org/viewvc?rev=1358825&view=rev
Log:
HDFS-3614. Revert unused MiniDFSCluster constructor from HDFS-3049. Contributed
by Arun Murthy
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/MiniDFSCluster.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=1358825&r1=1358824&r2=1358825&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sun Jul 8
19:53:14 2012
@@ -180,6 +180,9 @@ Trunk (unreleased changes)
HDFS-3482. hdfs balancer throws ArrayIndexOutOfBoundsException
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 )
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1358825&r1=1358824&r2=1358825&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
Sun Jul 8 19:53:14 2012
@@ -392,7 +392,7 @@ public class MiniDFSCluster {
public MiniDFSCluster(Configuration conf,
int numDataNodes,
StartupOption nameNodeOperation) throws IOException {
- this(0, conf, numDataNodes, false, false, false, false,
nameNodeOperation,
+ this(0, conf, numDataNodes, false, false, false, nameNodeOperation,
null, null, null);
}
@@ -414,7 +414,7 @@ public class MiniDFSCluster {
int numDataNodes,
boolean format,
String[] racks) throws IOException {
- this(0, conf, numDataNodes, format, true, true, true, null,
+ this(0, conf, numDataNodes, format, true, true, null,
racks, null, null);
}
@@ -437,7 +437,7 @@ public class MiniDFSCluster {
int numDataNodes,
boolean format,
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);
}
@@ -472,7 +472,7 @@ public class MiniDFSCluster {
StartupOption operation,
String[] racks) throws IOException {
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,
String[] racks,
long[] simulatedCapacities) throws IOException {
- this(nameNodePort, conf, numDataNodes, format, manageDfsDirs,
manageDfsDirs,
+ this(nameNodePort, conf, numDataNodes, format, manageDfsDirs,
manageDfsDirs, operation, racks, null, simulatedCapacities);
}
@@ -540,14 +540,13 @@ public class MiniDFSCluster {
int numDataNodes,
boolean format,
boolean manageNameDfsDirs,
- boolean enableManagedDfsDirsRedundancy,
boolean manageDataDfsDirs,
StartupOption operation,
String[] racks, String hosts[],
long[] simulatedCapacities) throws IOException {
this.nameNodes = new NameNodeInfo[1]; // Single namenode in the cluster
initMiniDFSCluster(conf, numDataNodes, format,
- manageNameDfsDirs, true, enableManagedDfsDirsRedundancy,
manageDataDfsDirs,
+ manageNameDfsDirs, true, manageDataDfsDirs, manageDataDfsDirs,
operation, racks, hosts,
simulatedCapacities, null, true, false,
MiniDFSNNTopology.simpleSingleNN(nameNodePort, 0));
