You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ni...@apache.org on 2013/03/08 19:44:44 UTC
git commit: GIRAPH-523: MasterObserver should pass in superstep
number (gaurav.menghani via nitay)
Updated Branches:
refs/heads/trunk c14e524b6 -> 40e201df9
GIRAPH-523: MasterObserver should pass in superstep number (gaurav.menghani via nitay)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/40e201df
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/40e201df
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/40e201df
Branch: refs/heads/trunk
Commit: 40e201df9bb32cb4d3ff0b02c7899f3e9bed2529
Parents: c14e524
Author: Nitay Joffe <ni...@apache.org>
Authored: Fri Mar 8 13:42:58 2013 -0500
Committer: Nitay Joffe <ni...@apache.org>
Committed: Fri Mar 8 13:44:41 2013 -0500
----------------------------------------------------------------------
CHANGELOG | 2 ++
.../org/apache/giraph/master/BspServiceMaster.java | 4 ++--
.../giraph/master/DefaultMasterObserver.java | 4 ++--
.../org/apache/giraph/master/MasterObserver.java | 8 ++++++--
.../org/apache/giraph/utils/JMapHistoDumper.java | 6 ------
.../apache/giraph/master/TestMasterObserver.java | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 3fdfb63..f06627f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-523: MasterObserver should pass in superstep number (gaurav.menghani via nitay)
+
GIRAPH-556: Race condition in EdgeStore (apresta)
GIRAPH-528: Decouple vertex implementation from edge storage (apresta)
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/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 b84e21b..87497b8 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
@@ -1395,7 +1395,7 @@ public class BspServiceMaster<I extends WritableComparable,
// 6. If the checkpoint frequency is met, finalize the checkpoint
for (MasterObserver observer : observers) {
- observer.preSuperstep();
+ observer.preSuperstep(getSuperstep());
getContext().progress();
}
@@ -1646,7 +1646,7 @@ public class BspServiceMaster<I extends WritableComparable,
@Override
public void postSuperstep() {
for (MasterObserver observer : observers) {
- observer.postSuperstep();
+ observer.postSuperstep(getSuperstep());
getContext().progress();
}
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/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 f566979..b044799 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
@@ -47,8 +47,8 @@ public class DefaultMasterObserver implements MasterObserver {
public void applicationFailed(Exception e) { }
@Override
- public void preSuperstep() { }
+ public void preSuperstep(long superstep) { }
@Override
- public void postSuperstep() { }
+ public void postSuperstep(long superstep) { }
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/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 a72b18a..b12400a 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
@@ -43,11 +43,15 @@ public interface MasterObserver extends ImmutableClassesGiraphConfigurable {
/**
* Before each superstep starts.
+ *
+ * @param superstep The superstep number
*/
- void preSuperstep();
+ void preSuperstep(long superstep);
/**
* After each superstep ends.
+ *
+ * @param superstep The superstep number
*/
- void postSuperstep();
+ void postSuperstep(long superstep);
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/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 256f5d1..463510f 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
@@ -97,12 +97,6 @@ public class JMapHistoDumper implements MasterObserver, WorkerObserver {
public void applicationFailed(Exception e) { }
@Override
- public void preSuperstep() { }
-
- @Override
- public void postSuperstep() { }
-
- @Override
public void setConf(ImmutableClassesGiraphConfiguration configuration) {
sleepMillis = configuration.getInt(GiraphConstants.JMAP_SLEEP_MILLIS,
GiraphConstants.JMAP_SLEEP_MILLIS_DEFAULT);
http://git-wip-us.apache.org/repos/asf/giraph/blob/40e201df/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java b/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
index ba43d8e..54a8b92 100644
--- a/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
+++ b/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
@@ -66,12 +66,12 @@ public class TestMasterObserver {
}
@Override
- public void preSuperstep() {
+ public void preSuperstep(long superstep) {
++preSuperstep;
}
@Override
- public void postSuperstep() {
+ public void postSuperstep(long superstep) {
++postSuperstep;
}
}