Repository: hadoop Updated Branches: refs/heads/branch-1 c79260580 -> 689ca40fc
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/689ca40f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/689ca40f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/689ca40f Branch: refs/heads/branch-1 Commit: 689ca40fc68de66749936cbb1cc044cb8df25fa5 Parents: c792605 Author: Sandy Ryza <[email protected]> Authored: Tue Oct 21 01:46:33 2014 -0400 Committer: Sandy Ryza <[email protected]> Committed: Tue Oct 21 01:46:33 2014 -0400 ---------------------------------------------------------------------- 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/689ca40f/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 0fd724b..6e04701 100644 --- a/src/mapred/org/apache/hadoop/mapreduce/Job.java +++ b/src/mapred/org/apache/hadoop/mapreduce/Job.java @@ -536,9 +536,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);
