You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ju...@apache.org on 2016/01/11 15:05:28 UTC
hadoop git commit: MAPREDUCE-6068. Illegal progress value warnings in
map tasks. Contributed by Binglin Chang. (cherry picked from commit
8c1adeaa26a7eaaca891dccdb71ff085e598a7de)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 da42b0164 -> 51073c910
MAPREDUCE-6068. Illegal progress value warnings in map tasks. Contributed by Binglin Chang.
(cherry picked from commit 8c1adeaa26a7eaaca891dccdb71ff085e598a7de)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/51073c91
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/51073c91
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/51073c91
Branch: refs/heads/branch-2
Commit: 51073c910ccdfaa07f7b8dab290617b56e4d86b7
Parents: da42b01
Author: Junping Du <ju...@apache.org>
Authored: Mon Jan 11 06:12:19 2016 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Mon Jan 11 06:13:53 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/51073c91/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index f8a734c..329133c 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -385,8 +385,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)
@@ -394,6 +394,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/51073c91/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