From d46bbdd43fba1ed2e34fa44706b041a8e0c1cc88 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Thu, 7 Mar 2013 23:03:10 +0000 Subject: [PATCH] MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash via tgraves) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454157 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../mapreduce/v2/app/webapp/dao/JobCounterInfo.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1ba466845bb..b89041e572e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -630,6 +630,9 @@ Release 0.23.7 - UNRELEASED MAPREDUCE-5043. Fetch failure processing can cause AM event queue to backup and eventually OOM (Jason Lowe via bobby) + MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi + Prakash via tgraves) + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java index 8d5c46992c4..2d3e246922d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobCounterInfo.java @@ -71,10 +71,15 @@ public class JobCounterInfo { } private void getCounters(AppContext ctx, Job job) { - total = new Counters(); if (job == null) { return; } + total = job.getAllCounters(); + boolean needTotalCounters = false; + if (total == null) { + total = new Counters(); + needTotalCounters = true; + } map = new Counters(); reduce = new Counters(); // Get all types of counters @@ -84,7 +89,6 @@ public class JobCounterInfo { if (counters == null) { continue; } - total.incrAllCounters(counters); switch (t.getType()) { case MAP: map.incrAllCounters(counters); @@ -93,6 +97,9 @@ public class JobCounterInfo { reduce.incrAllCounters(counters); break; } + if (needTotalCounters) { + total.incrAllCounters(counters); + } } }