You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2008/03/27 14:36:42 UTC
svn commit: r641807 - in /hadoop/core/trunk: CHANGES.txt
src/test/org/apache/hadoop/mapred/MiniMRCluster.java
src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
Author: ddas
Date: Thu Mar 27 06:36:36 2008
New Revision: 641807
URL: http://svn.apache.org/viewvc?rev=641807&view=rev
Log:
HADOOP-3060. Removes one unused constructor argument from MiniMRCluster. Contributed by Amareshwari Sriramadasu.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=641807&r1=641806&r2=641807&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Mar 27 06:36:36 2008
@@ -56,6 +56,9 @@
org.apache.hadoop.record.compiler.generated.SimpleCharStream.
(Amareshwari Sriramadasu via ddas)
+ HADOOP-3060. Removes one unused constructor argument from MiniMRCluster.
+ (Amareshwari Sriramadasu via ddas)
+
NEW FEATURES
HADOOP-1398. Add HBase in-memory block cache. (tomwhite)
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=641807&r1=641806&r2=641807&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Thu Mar 27 06:36:36 2008
@@ -270,7 +270,7 @@
*/
public MiniMRCluster(int numTaskTrackers, String namenode, int numDir,
String[] racks, String[] hosts) throws IOException {
- this(0, 0, numTaskTrackers, namenode, false, numDir, racks, hosts);
+ this(0, 0, numTaskTrackers, namenode, numDir, racks, hosts);
}
/**
@@ -282,41 +282,41 @@
*/
public MiniMRCluster(int numTaskTrackers, String namenode, int numDir)
throws IOException {
- this(0, 0, numTaskTrackers, namenode, false, numDir);
+ this(0, 0, numTaskTrackers, namenode, numDir);
}
public MiniMRCluster(int jobTrackerPort,
int taskTrackerPort,
int numTaskTrackers,
String namenode,
- boolean taskTrackerFirst, int numDir)
+ int numDir)
throws IOException {
this(jobTrackerPort, taskTrackerPort, numTaskTrackers, namenode,
- taskTrackerFirst, numDir, null);
+ numDir, null);
}
public MiniMRCluster(int jobTrackerPort,
int taskTrackerPort,
int numTaskTrackers,
String namenode,
- boolean taskTrackerFirst, int numDir,
+ int numDir,
String[] racks) throws IOException {
this(jobTrackerPort, taskTrackerPort, numTaskTrackers, namenode,
- taskTrackerFirst, numDir, racks, null);
+ numDir, racks, null);
}
public MiniMRCluster(int jobTrackerPort,
int taskTrackerPort,
int numTaskTrackers,
String namenode,
- boolean taskTrackerFirst, int numDir,
+ int numDir,
String[] racks, String[] hosts) throws IOException {
this(jobTrackerPort, taskTrackerPort, numTaskTrackers, namenode,
- taskTrackerFirst, numDir, racks, hosts, null);
+ numDir, racks, hosts, null);
}
public MiniMRCluster(int jobTrackerPort, int taskTrackerPort,
- int numTaskTrackers, String namenode, boolean taskTrackerFirst,
+ int numTaskTrackers, String namenode,
int numDir, String[] racks, String[] hosts, UnixUserGroupInformation ugi
) throws IOException {
if (racks != null && racks.length < numTaskTrackers) {
@@ -379,16 +379,8 @@
// Start the MiniMRCluster
- if (taskTrackerFirst) {
- for (Thread taskTrackerThread : taskTrackerThreadList){
- taskTrackerThread.start();
- }
- }
-
- if (!taskTrackerFirst) {
- for (Thread taskTrackerThread : taskTrackerThreadList){
- taskTrackerThread.start();
- }
+ for (Thread taskTrackerThread : taskTrackerThreadList){
+ taskTrackerThread.start();
}
// Wait till the MR cluster stabilizes
Modified: hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java?rev=641807&r1=641806&r2=641807&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java (original)
+++ hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java Thu Mar 27 06:36:36 2008
@@ -72,7 +72,7 @@
UnixUserGroupInformation MR_UGI = createUGI(
UnixUserGroupInformation.login().getUserName(), true);
mr = new MiniMRCluster(0, 0, 4, dfs.getFileSystem().getUri().toString(),
- false, 1, null, null, MR_UGI);
+ 1, null, null, MR_UGI);
JobConf pi = createJobConf(mr, PI_UGI);
TestMiniMRWithDFS.runPI(mr, pi);
@@ -84,4 +84,4 @@
if (mr != null) { mr.shutdown();}
}
}
-}
\ No newline at end of file
+}