You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ma...@apache.org on 2018/01/10 23:56:55 UTC
git commit: updated refs/heads/trunk to 8e2df4f
Repository: giraph
Updated Branches:
refs/heads/trunk dc500a7ad -> 8e2df4f8c
JIRA-1166
closes #55
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/8e2df4f8
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/8e2df4f8
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/8e2df4f8
Branch: refs/heads/trunk
Commit: 8e2df4f8cff43e2fd7f7eda1b9f73cd093008c3e
Parents: dc500a7
Author: Maja Kabiljo <ma...@fb.com>
Authored: Wed Jan 10 15:56:49 2018 -0800
Committer: Maja Kabiljo <ma...@fb.com>
Committed: Wed Jan 10 15:56:49 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/giraph/master/BspServiceMaster.java | 3 +++
.../org/apache/giraph/master/DefaultMasterObserver.java | 5 +++++
.../java/org/apache/giraph/master/MasterObserver.java | 10 ++++++++++
.../java/org/apache/giraph/metrics/ValueWithHostname.java | 2 +-
.../java/org/apache/giraph/utils/JMapHistoDumper.java | 5 +++++
.../main/java/org/apache/giraph/utils/LogVersions.java | 5 +++++
.../org/apache/giraph/utils/ReactiveJMapHistoDumper.java | 5 +++++
7 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
index fe9c060..d529ffe 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/BspServiceMaster.java
@@ -984,6 +984,9 @@ public class BspServiceMaster<I extends WritableComparable,
} else {
printAggregatedMetricsToHDFS(superstep, aggregatedMetrics);
}
+ for (MasterObserver observer : observers) {
+ observer.superstepMetricsUpdate(superstep, aggregatedMetrics);
+ }
}
if (LOG.isInfoEnabled()) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/master/DefaultMasterObserver.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/DefaultMasterObserver.java b/giraph-core/src/main/java/org/apache/giraph/master/DefaultMasterObserver.java
index b044799..7854a16 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/DefaultMasterObserver.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/DefaultMasterObserver.java
@@ -19,6 +19,7 @@
package org.apache.giraph.master;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.metrics.AggregatedMetrics;
/**
* A no-op implementation of MasterObserver to make it easier for users.
@@ -51,4 +52,8 @@ public class DefaultMasterObserver implements MasterObserver {
@Override
public void postSuperstep(long superstep) { }
+
+ @Override
+ public void superstepMetricsUpdate(long superstep,
+ AggregatedMetrics aggregatedMetrics) { }
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/master/MasterObserver.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/MasterObserver.java b/giraph-core/src/main/java/org/apache/giraph/master/MasterObserver.java
index 3012308..4931ea8 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/MasterObserver.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/MasterObserver.java
@@ -19,6 +19,7 @@
package org.apache.giraph.master;
import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable;
+import org.apache.giraph.metrics.AggregatedMetrics;
/**
* Observer for Master.
@@ -55,4 +56,13 @@ public interface MasterObserver extends ImmutableClassesGiraphConfigurable {
* @param superstep The superstep number
*/
void postSuperstep(long superstep);
+
+ /**
+ * Called after each superstep with aggregated metrics from workers
+ *
+ * @param superstep Supsertep number
+ * @param aggregatedMetrics Metrics
+ */
+ void superstepMetricsUpdate(
+ long superstep, AggregatedMetrics aggregatedMetrics);
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/metrics/ValueWithHostname.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/metrics/ValueWithHostname.java b/giraph-core/src/main/java/org/apache/giraph/metrics/ValueWithHostname.java
index 91a7398..c521b72 100644
--- a/giraph-core/src/main/java/org/apache/giraph/metrics/ValueWithHostname.java
+++ b/giraph-core/src/main/java/org/apache/giraph/metrics/ValueWithHostname.java
@@ -23,7 +23,7 @@ package org.apache.giraph.metrics;
*
* @param <T> types of value (either long or double)
*/
-class ValueWithHostname<T extends Number> {
+public class ValueWithHostname<T extends Number> {
/** long value we're holding */
private T value;
/** host associated with value */
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/utils/JMapHistoDumper.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/JMapHistoDumper.java b/giraph-core/src/main/java/org/apache/giraph/utils/JMapHistoDumper.java
index 674929a..b34f926 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/JMapHistoDumper.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/JMapHistoDumper.java
@@ -21,6 +21,7 @@ package org.apache.giraph.utils;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.master.MasterObserver;
+import org.apache.giraph.metrics.AggregatedMetrics;
import org.apache.giraph.worker.WorkerObserver;
import org.apache.log4j.Logger;
@@ -100,6 +101,10 @@ public class JMapHistoDumper implements MasterObserver, WorkerObserver {
public void postSuperstep(long superstep) { }
@Override
+ public void superstepMetricsUpdate(long superstep,
+ AggregatedMetrics aggregatedMetrics) { }
+
+ @Override
public void applicationFailed(Exception e) { }
@Override
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/utils/LogVersions.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/LogVersions.java b/giraph-core/src/main/java/org/apache/giraph/utils/LogVersions.java
index 5bdad87..6fbc32b 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/LogVersions.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/LogVersions.java
@@ -19,6 +19,7 @@ package org.apache.giraph.utils;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.master.MasterObserver;
+import org.apache.giraph.metrics.AggregatedMetrics;
import org.apache.giraph.worker.WorkerObserver;
/**
@@ -55,4 +56,8 @@ public class LogVersions implements WorkerObserver, MasterObserver {
@Override
public void postSuperstep(long superstep) { }
+
+ @Override
+ public void superstepMetricsUpdate(long superstep,
+ AggregatedMetrics aggregatedMetrics) { }
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/8e2df4f8/giraph-core/src/main/java/org/apache/giraph/utils/ReactiveJMapHistoDumper.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/ReactiveJMapHistoDumper.java b/giraph-core/src/main/java/org/apache/giraph/utils/ReactiveJMapHistoDumper.java
index 778311c..190e755 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/ReactiveJMapHistoDumper.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/ReactiveJMapHistoDumper.java
@@ -22,6 +22,7 @@ import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.master.MasterObserver;
+import org.apache.giraph.metrics.AggregatedMetrics;
import org.apache.giraph.worker.WorkerObserver;
import org.apache.log4j.Logger;
@@ -111,6 +112,10 @@ public class ReactiveJMapHistoDumper extends
public void postSuperstep(long superstep) { }
@Override
+ public void superstepMetricsUpdate(long superstep,
+ AggregatedMetrics aggregatedMetrics) { }
+
+ @Override
public void applicationFailed(Exception e) { }
@Override