Repository: hadoop Updated Branches: refs/heads/branch-1.2 13a3c834b -> 9944fe44d
MAPREDUCE-6009. Map-only job with new-api runs wrong OutputCommitter when cleanup scheduled in a reduce slot (Gera Shegalov via Sandy Ryza) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9944fe44 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9944fe44 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9944fe44 Branch: refs/heads/branch-1.2 Commit: 9944fe44d984af54c19b2412d2f91eba72bdbe8c Parents: 13a3c83 Author: Sandy Ryza <[email protected]> Authored: Tue Oct 21 01:46:33 2014 -0400 Committer: Sandy Ryza <[email protected]> Committed: Tue Oct 21 08:15:15 2014 -0700 ---------------------------------------------------------------------- src/mapred/org/apache/hadoop/mapreduce/Job.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9944fe44/src/mapred/org/apache/hadoop/mapreduce/Job.java ---------------------------------------------------------------------- diff --git a/src/mapred/org/apache/hadoop/mapreduce/Job.java b/src/mapred/org/apache/hadoop/mapreduce/Job.java index e3df019..5ca47fb 100644 --- a/src/mapred/org/apache/hadoop/mapreduce/Job.java +++ b/src/mapred/org/apache/hadoop/mapreduce/Job.java @@ -521,9 +521,9 @@ public class Job extends JobContext { ensureNotSet(JobContext.OUTPUT_FORMAT_CLASS_ATTR, mode); } } + conf.setBooleanIfUnset("mapred.reducer.new-api", + conf.get(oldReduceClass) == null); if (numReduces != 0) { - conf.setBooleanIfUnset("mapred.reducer.new-api", - conf.get(oldReduceClass) == null); if (conf.getUseNewReducer()) { String mode = "new reduce API"; ensureNotSet("mapred.output.format.class", mode);
