Return-Path: X-Original-To: apmail-giraph-commits-archive@www.apache.org Delivered-To: apmail-giraph-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C7FEE4AE for ; Fri, 25 Jan 2013 03:18:54 +0000 (UTC) Received: (qmail 66828 invoked by uid 500); 25 Jan 2013 03:18:54 -0000 Delivered-To: apmail-giraph-commits-archive@giraph.apache.org Received: (qmail 64118 invoked by uid 500); 25 Jan 2013 03:18:47 -0000 Mailing-List: contact commits-help@giraph.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@giraph.apache.org Delivered-To: mailing list commits@giraph.apache.org Received: (qmail 64049 invoked by uid 99); 25 Jan 2013 03:18:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 03:18:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6ED8F82515B; Fri, 25 Jan 2013 03:18:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitay@apache.org To: commits@giraph.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: GIRAPH-490: Constants for GiraphStats / GiraphTimers (nitay) Message-Id: <20130125031844.6ED8F82515B@tyr.zones.apache.org> Date: Fri, 25 Jan 2013 03:18:44 +0000 (UTC) Updated Branches: refs/heads/trunk bda0f8b95 -> 0e1dd3291 GIRAPH-490: Constants for GiraphStats / GiraphTimers (nitay) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/0e1dd329 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/0e1dd329 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/0e1dd329 Branch: refs/heads/trunk Commit: 0e1dd32911236db6a3e379141a4a59acaac0c00d Parents: bda0f8b Author: Nitay Joffe Authored: Thu Jan 24 16:42:57 2013 -0800 Committer: Nitay Joffe Committed: Thu Jan 24 18:52:08 2013 -0800 ---------------------------------------------------------------------- CHANGELOG | 2 + .../org/apache/giraph/counters/GiraphStats.java | 35 +++++++++++--- .../org/apache/giraph/counters/GiraphTimers.java | 12 ++++- 3 files changed, 38 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/0e1dd329/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 71c21cd..2d429f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-490: Constants for GiraphStats / GiraphTimers (nitay) + GIRAPH-488: ArrayOutOfBoundsException in org.apache.giraph.worker.InputSplitPathOrganizer (ereisman) GIRAPH-418: Create maven profile for CDH 4.1.2 (ekoontz) http://git-wip-us.apache.org/repos/asf/giraph/blob/0e1dd329/giraph-core/src/main/java/org/apache/giraph/counters/GiraphStats.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/counters/GiraphStats.java b/giraph-core/src/main/java/org/apache/giraph/counters/GiraphStats.java index 6981773..3f25508 100644 --- a/giraph-core/src/main/java/org/apache/giraph/counters/GiraphStats.java +++ b/giraph-core/src/main/java/org/apache/giraph/counters/GiraphStats.java @@ -29,6 +29,25 @@ import java.util.Iterator; public class GiraphStats extends HadoopCountersBase { /** Counter group name for the Giraph statistics */ public static final String GROUP_NAME = "Giraph Stats"; + /** superstep counter name */ + public static final String SUPERSTEP_NAME = "Superstep"; + /** aggregate vertices counter name */ + public static final String VERTICES_NAME = "Aggregate vertices"; + /** aggregate finished vertices counter name */ + public static final String FINISHED_VERTICES_NAME = + "Aggregate finished vertices"; + /** aggregate edges counter name */ + public static final String EDGES_NAME = "Aggregate edges"; + /** sent messages counter name */ + public static final String SENT_MESSAGES_NAME = "Sent messages"; + /** workers counter name */ + public static final String CURRENT_WORKERS_NAME = "Current workers"; + /** current master partition task counter name */ + public static final String CURRENT_MASTER_PARTITION_TASK_NAME = + "Current master task partition"; + /** last checkpointed superstep counter name */ + public static final String LAST_CHECKPOINTED_SUPERSTEP_NAME = + "Last checkpointed superstep"; /** Singleton instance for everyone to use */ private static GiraphStats INSTANCE; @@ -63,16 +82,16 @@ public class GiraphStats extends HadoopCountersBase { private GiraphStats(Context context) { super(context, GROUP_NAME); counters = new GiraphHadoopCounter[NUM_COUNTERS]; - counters[SUPERSTEP] = getCounter("Superstep"); - counters[VERTICES] = getCounter("Aggregate vertices"); - counters[FINISHED_VERTICES] = getCounter("Aggregate finished vertices"); - counters[EDGES] = getCounter("Aggregate edges"); - counters[SENT_MESSAGES] = getCounter("Sent messages"); - counters[CURRENT_WORKERS] = getCounter("Current workers"); + counters[SUPERSTEP] = getCounter(SUPERSTEP_NAME); + counters[VERTICES] = getCounter(VERTICES_NAME); + counters[FINISHED_VERTICES] = getCounter(FINISHED_VERTICES_NAME); + counters[EDGES] = getCounter(EDGES_NAME); + counters[SENT_MESSAGES] = getCounter(SENT_MESSAGES_NAME); + counters[CURRENT_WORKERS] = getCounter(CURRENT_WORKERS_NAME); counters[CURRENT_MASTER_TASK_PARTITION] = - getCounter("Current master task partition"); + getCounter(CURRENT_MASTER_PARTITION_TASK_NAME); counters[LAST_CHECKPOINTED_SUPERSTEP] = - getCounter("Last checkpointed superstep"); + getCounter(LAST_CHECKPOINTED_SUPERSTEP_NAME); } /** http://git-wip-us.apache.org/repos/asf/giraph/blob/0e1dd329/giraph-core/src/main/java/org/apache/giraph/counters/GiraphTimers.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/counters/GiraphTimers.java b/giraph-core/src/main/java/org/apache/giraph/counters/GiraphTimers.java index a787b25..0d50c29 100644 --- a/giraph-core/src/main/java/org/apache/giraph/counters/GiraphTimers.java +++ b/giraph-core/src/main/java/org/apache/giraph/counters/GiraphTimers.java @@ -33,6 +33,12 @@ import java.util.Map; public class GiraphTimers extends HadoopCountersBase { /** Counter group name for the giraph timers */ public static final String GROUP_NAME = "Giraph Timers"; + /** Counter name for setup msec */ + public static final String SETUP_MS_NAME = "Setup (milliseconds)"; + /** Counter name for total msec */ + public static final String TOTAL_MS_NAME = "Total (milliseconds)"; + /** Counter name for shutdown msec */ + public static final String SHUTDOWN_MS_NAME = "Shutdown (milliseconds)"; /** Singleton instance for everyone to use */ private static GiraphTimers INSTANCE; @@ -60,9 +66,9 @@ public class GiraphTimers extends HadoopCountersBase { private GiraphTimers(Context context) { super(context, GROUP_NAME); jobCounters = new GiraphHadoopCounter[NUM_COUNTERS]; - jobCounters[SETUP_MS] = getCounter("Setup (milliseconds)"); - jobCounters[TOTAL_MS] = getCounter("Total (milliseconds)"); - jobCounters[SHUTDOWN_MS] = getCounter("Shutdown (milliseconds)"); + jobCounters[SETUP_MS] = getCounter(SETUP_MS_NAME); + jobCounters[TOTAL_MS] = getCounter(TOTAL_MS_NAME); + jobCounters[SHUTDOWN_MS] = getCounter(SHUTDOWN_MS_NAME); superstepMsec = Maps.newHashMap(); }