Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D7D375A3 for ; Fri, 28 Oct 2011 05:09:16 +0000 (UTC) Received: (qmail 33997 invoked by uid 500); 28 Oct 2011 05:09:15 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 33952 invoked by uid 500); 28 Oct 2011 05:09:15 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 33943 invoked by uid 99); 28 Oct 2011 05:09:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 05:09:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 05:09:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DE1C8238897A; Fri, 28 Oct 2011 05:08:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190161 - in /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/ hadoop-mapreduce-client/hadoop-mapreduce-client-hs/s... Date: Fri, 28 Oct 2011 05:08:53 -0000 To: mapreduce-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111028050853.DE1C8238897A@eris.apache.org> Author: acmurthy Date: Fri Oct 28 05:08:53 2011 New Revision: 1190161 URL: http://svn.apache.org/viewvc?rev=1190161&view=rev Log: Merge -c 1190160 from trunk to branch-0.23 to fix MAPREDUCE-3258. Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1190161&r1=1190160&r2=1190161&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri Oct 28 05:08:53 2011 @@ -1763,11 +1763,15 @@ Release 0.23.0 - Unreleased MAPREDUCE-3282. bin/mapred job -list throws exception. (acmurthy via mahadev) - MAPREDUCE-3186. User jobs are getting hanged if the Resource manager process goes down - and comes up while job is getting executed. (Eric Payne via mahadev) + MAPREDUCE-3186. User jobs are getting hanged if the Resource manager + process goes down and comes up while job is getting executed. + (Eric Payne via mahadev) MAPREDUCE-3285. Tests on branch-0.23 failing (Siddharth Seth via mahadev) + MAPREDUCE-3258. Fixed AM & JobHistory web-ui to display counters properly. + (Siddharth Seth via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java?rev=1190161&r1=1190160&r2=1190161&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/CountersBlock.java Fri Oct 28 05:08:53 2011 @@ -119,11 +119,16 @@ public class CountersBlock extends HtmlB for (Counter counter : g.getAllCounters().values()) { // Ditto TR>>>>>>> groupRow = group. - tr(). - td().$title(counter.getName()). + tr(); + if (mg == null && rg == null) { + groupRow.td().$title(counter.getName())._(counter.getDisplayName()). + _(); + } else { + groupRow.td().$title(counter.getName()). a(url(urlBase,urlId,g.getName(), counter.getName()), counter.getDisplayName()). _(); + } if (map != null) { Counter mc = mg == null ? null : mg.getCounter(counter.getName()); Counter rc = rg == null ? null : rg.getCounter(counter.getName()); @@ -168,12 +173,11 @@ public class CountersBlock extends HtmlB } // Get all types of counters Map tasks = job.getTasks(); - total = JobImpl.newCounters(); + total = job.getCounters(); map = JobImpl.newCounters(); reduce = JobImpl.newCounters(); for (Task t : tasks.values()) { Counters counters = t.getCounters(); - JobImpl.incrAllCounters(total, counters); switch (t.getType()) { case MAP: JobImpl.incrAllCounters(map, counters); break; case REDUCE: JobImpl.incrAllCounters(reduce, counters); break; @@ -184,4 +188,4 @@ public class CountersBlock extends HtmlB private String fixGroupDisplayName(CharSequence name) { return name.toString().replace(".", ".\u200B").replace("$", "\u200B$"); } -} +} \ No newline at end of file Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java?rev=1190161&r1=1190160&r2=1190161&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java Fri Oct 28 05:08:53 2011 @@ -175,6 +175,14 @@ public class TestHSWebApp { new TestAppContext()); } + @Test public void testJobCounterView() { + LOG.info("JobCounterView"); + AppContext appContext = new TestAppContext(); + Map params = TestAMWebApp.getJobParams(appContext); + WebAppTests.testPage(HsCountersPage.class, AppContext.class, + appContext, params); + } + @Test public void testSingleCounterView() { LOG.info("HsSingleCounterPage"); WebAppTests.testPage(HsSingleCounterPage.class, AppContext.class,