Author: tomwhite
Date: Wed Mar 27 11:42:32 2013
New Revision: 1461537
URL: http://svn.apache.org/r1461537
Log:
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed
by Sandy Ryza.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1461537&r1=1461536&r2=1461537&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
Mar 27 11:42:32 2013
@@ -110,6 +110,9 @@ Release 2.0.5-beta - UNRELEASED
MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and
sortFinished times when needed. (Ravi Gummadi via tgraves)
+ MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994.
+ (Sandy Ryza via tomwhite)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java?rev=1461537&r1=1461536&r2=1461537&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Wed Mar 27 11:42:32 2013
@@ -37,9 +37,7 @@ public class LocalClientProtocolProvider
if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) {
return null;
}
- if (conf.get("mapreduce.job.maps") == null) {
- conf.setInt("mapreduce.job.maps", 1);
- }
+ conf.setInt(JobContext.NUM_MAPS, 1);
return new LocalJobRunner(conf);
}
