Author: ddas
Date: Fri Dec 12 04:21:22 2008
New Revision: 725981
URL: http://svn.apache.org/viewvc?rev=725981&view=rev
Log:
Merge -r 725978:725979 from trunk onto 0.19 branch. Fixes HADOOP-4857.
Modified:
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=725981&r1=725980&r2=725981&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Fri Dec 12 04:21:22 2008
@@ -1090,6 +1090,9 @@
HADOOP-4620. Fixes Streaming to handle well the cases of map/reduce with
empty
input/output. (Ravi Gummadi via ddas)
+ HADOOP-4857. Fixes TestUlimit to have exactly 1 map in the jobs spawned.
+ (Ravi Gummadi via ddas)
+
Release 0.18.2 - 2008-11-03
BUG FIXES
Modified:
hadoop/core/branches/branch-0.19/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java?rev=725981&r1=725980&r2=725981&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.19/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
(original)
+++
hadoop/core/branches/branch-0.19/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java
Fri Dec 12 04:21:22 2008
@@ -53,6 +53,7 @@
"-mapper", map,
"-reducer", "org.apache.hadoop.mapred.lib.IdentityReducer",
"-numReduceTasks", "0",
+ "-jobconf", "mapred.map.tasks=1",
"-jobconf", "mapred.child.ulimit=" + memLimit,
"-jobconf", "mapred.job.tracker=" + "localhost:" +
mr.getJobTrackerPort(),
