Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 09dbb1156 -> 5074d836b
MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly
misleading. Contributed by Nathan Roberts
(cherry picked from commit cab3c7c8892ad33a7eb0955b01e99872ab95e192)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5074d836
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5074d836
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5074d836
Branch: refs/heads/branch-2.6
Commit: 5074d836b08a99361ed8fa348dadfc6746f4b57c
Parents: 09dbb11
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Nov 24 22:03:39 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Nov 24 22:03:39 2015 +0000
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../org/apache/hadoop/mapreduce/JobCounter.properties | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5074d836/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index b737ecb..a395c8a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -32,6 +32,9 @@ Release 2.6.3 - UNRELEASED
position/key information for uncompressed input sometimes. (Zhihai Xu via
jlowe)
+ MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly
+ misleading (Nathan Roberts via jlowe)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5074d836/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties
index 7a493a8..774002b 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties
@@ -27,9 +27,9 @@ SLOTS_MILLIS_MAPS.name= Total time spent by all
maps in occupied slot
SLOTS_MILLIS_REDUCES.name= Total time spent by all reduces in occupied
slots (ms)
MILLIS_MAPS.name= Total time spent by all map tasks (ms)
MILLIS_REDUCES.name= Total time spent by all reduce tasks (ms)
-MB_MILLIS_MAPS.name= Total megabyte-seconds taken by all map
tasks
-MB_MILLIS_REDUCES.name= Total megabyte-seconds taken by all reduce
tasks
-VCORES_MILLIS_MAPS.name= Total vcore-seconds taken by all map tasks
-VCORES_MILLIS_REDUCES.name= Total vcore-seconds taken by all reduce
tasks
+MB_MILLIS_MAPS.name= Total megabyte-milliseconds taken by all
map tasks
+MB_MILLIS_REDUCES.name= Total megabyte-milliseconds taken by all
reduce tasks
+VCORES_MILLIS_MAPS.name= Total vcore-milliseconds taken by all map
tasks
+VCORES_MILLIS_REDUCES.name= Total vcore-milliseconds taken by all
reduce tasks
FALLOW_SLOTS_MILLIS_MAPS.name= Total time spent by all maps waiting after
reserving slots (ms)
FALLOW_SLOTS_MILLIS_REDUCES.name= Total time spent by all reduces waiting
after reserving slots (ms)
