Updated Branches: refs/heads/trunk 6c0917ab1 -> 4caffaf2b
GIRAPH-718: Output all per-superstep metrics per superstep (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/4caffaf2 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/4caffaf2 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/4caffaf2 Branch: refs/heads/trunk Commit: 4caffaf2b0c9c5be90eab06a9d6df38b62e68429 Parents: 6c0917a Author: Maja Kabiljo <[email protected]> Authored: Mon Jul 15 16:49:06 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Mon Jul 15 16:49:06 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../java/org/apache/giraph/graph/GraphTaskManager.java | 3 +++ .../java/org/apache/giraph/metrics/GiraphMetrics.java | 1 - .../apache/giraph/metrics/SuperstepMetricsRegistry.java | 12 ++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/4caffaf2/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 7e2cab1..c403f2f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-718: Output all per-superstep metrics per superstep (majakabiljo) + GIRAPH-716: Stop modifying Configuration since it's not thread-safe (majakabiljo) GIRAPH-715: Fix MessageValueFactory performance regression (nitay) http://git-wip-us.apache.org/repos/asf/giraph/blob/4caffaf2/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java index b0982b3..704fb9e 100644 --- a/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java +++ b/giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java @@ -790,6 +790,9 @@ public class GraphTaskManager<I extends WritableComparable, V extends Writable, LOG.warn("map: No vertices in the graph, exiting."); return true; } + if (conf.metricsEnabled()) { + GiraphMetrics.get().perSuperstep().printSummary(System.err); + } return false; } http://git-wip-us.apache.org/repos/asf/giraph/blob/4caffaf2/giraph-core/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java b/giraph-core/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java index 7d980ea..10a2c18 100644 --- a/giraph-core/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java +++ b/giraph-core/src/main/java/org/apache/giraph/metrics/GiraphMetrics.java @@ -144,7 +144,6 @@ public class GiraphMetrics { public void dumpToStream(PrintStream out) { perJobOptional.printToStream(out); perJobRequired.printToStream(out); - perSuperstep.printToStream(out); } /** http://git-wip-us.apache.org/repos/asf/giraph/blob/4caffaf2/giraph-core/src/main/java/org/apache/giraph/metrics/SuperstepMetricsRegistry.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/metrics/SuperstepMetricsRegistry.java b/giraph-core/src/main/java/org/apache/giraph/metrics/SuperstepMetricsRegistry.java index c58a486..57e2431 100644 --- a/giraph-core/src/main/java/org/apache/giraph/metrics/SuperstepMetricsRegistry.java +++ b/giraph-core/src/main/java/org/apache/giraph/metrics/SuperstepMetricsRegistry.java @@ -21,7 +21,11 @@ package org.apache.giraph.metrics; import org.apache.giraph.conf.GiraphConfiguration; import org.apache.giraph.bsp.BspService; +import com.yammer.metrics.core.Metric; +import com.yammer.metrics.core.MetricName; +import com.yammer.metrics.core.MetricPredicate; import com.yammer.metrics.core.MetricsRegistry; +import com.yammer.metrics.reporting.ConsoleReporter; import com.yammer.metrics.reporting.JmxReporter; import java.io.PrintStream; @@ -100,5 +104,13 @@ public class SuperstepMetricsRegistry extends GiraphMetricsRegistry { */ public void printSummary(PrintStream out) { new WorkerSuperstepMetrics().readFromRegistry().print(superstep, out); + out.println(""); + MetricPredicate superstepFilter = new MetricPredicate() { + @Override + public boolean matches(MetricName name, Metric metric) { + return name.getType().equals(getType()); + } + }; + new ConsoleReporter(getInternalRegistry(), out, superstepFilter).run(); } }
