Repository: hadoop Updated Branches: refs/heads/branch-2.8 e26f70286 -> d7e10f817
MAPREDUCE-6068. Illegal progress value warnings in map tasks. Contributed by Binglin Chang. (cherry picked from commit 8c1adeaa26a7eaaca891dccdb71ff085e598a7de) (cherry picked from commit 51073c910ccdfaa07f7b8dab290617b56e4d86b7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7e10f81 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7e10f81 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7e10f81 Branch: refs/heads/branch-2.8 Commit: d7e10f81748b643543b5510daf0540ada9d10863 Parents: e26f702 Author: Junping Du <[email protected]> Authored: Mon Jan 11 06:12:19 2016 -0800 Committer: Junping Du <[email protected]> Committed: Mon Jan 11 06:14:58 2016 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 7 +++++-- .../src/main/java/org/apache/hadoop/mapred/Merger.java | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7e10f81/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 664909d..c582109 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -373,8 +373,8 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6550. archive-logs tool changes log ownership to the Yarn user when using DefaultContainerExecutor (rkanter) - MAPREDUCE-6419. JobHistoryServer doesn't sort properly based on Job ID when Job id's - exceed 9999. (Mohammad Shahid Khan via rohithsharmaks) + MAPREDUCE-6419. JobHistoryServer doesn't sort properly based on Job ID when Job id's + exceed 9999. (Mohammad Shahid Khan via rohithsharmaks) MAPREDUCE-6589. TestTaskLog outputs a log under directory other than target/test-dir. (aajisaka) @@ -382,6 +382,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6593. TestJobHistoryEventHandler.testTimelineEventHandling fails on trunk because of NPE. (Naganarasimha G R via aajisaka) + MAPREDUCE-6068. Illegal progress value warnings in map tasks. (Binglin Chang + via junping_du) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7e10f81/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Merger.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Merger.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Merger.java index fffa92a..3667e3c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Merger.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Merger.java @@ -519,7 +519,7 @@ public class Merger { boolean hasNext = reader.nextRawKey(); long endPos = reader.getReader().bytesRead; totalBytesProcessed += endPos - startPos; - mergeProgress.set(totalBytesProcessed * progPerByte); + mergeProgress.set(Math.min(1.0f, totalBytesProcessed * progPerByte)); if (hasNext) { adjustTop(); } else { @@ -571,7 +571,7 @@ public class Merger { } long endPos = minSegment.getReader().bytesRead; totalBytesProcessed += endPos - startPos; - mergeProgress.set(totalBytesProcessed * progPerByte); + mergeProgress.set(Math.min(1.0f, totalBytesProcessed * progPerByte)); return true; } @@ -698,7 +698,7 @@ public class Merger { totalBytesProcessed += startBytes; if (totalBytes != 0) - mergeProgress.set(totalBytesProcessed * progPerByte); + mergeProgress.set(Math.min(1.0f, totalBytesProcessed * progPerByte)); else mergeProgress.set(1.0f); // Last pass and no segments left - we're done
