Updated Branches: refs/heads/master 31c37843c -> c6177fbee
TEZ-185. NPE in MRCombiner when updating progress. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/c6177fbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/c6177fbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/c6177fbe Branch: refs/heads/master Commit: c6177fbeeee89ddba1d447d0388b0003613b6101 Parents: 31c3784 Author: Hitesh Shah <[email protected]> Authored: Thu Jun 6 13:46:26 2013 -0700 Committer: Hitesh Shah <[email protected]> Committed: Thu Jun 6 14:30:32 2013 -0700 ---------------------------------------------------------------------- .../apache/tez/mapreduce/combine/MRCombiner.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/c6177fbe/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java index a3880f4..dc7c53d 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/combine/MRCombiner.java @@ -195,7 +195,8 @@ public class MRCombiner implements Processor { } public void informReduceProgress() { - combinePhase.set(super.in.getProgress().getProgress()); // update progress + // FIXME implement correct progress updates for combiner TEZ-184 + // combinePhase.set(super.in.getProgress().getProgress()); // update progress reporter.progress(); } }
