Author: jghoman
Date: Thu Sep 1 01:19:41 2011
New Revision: 1163886
URL: http://svn.apache.org/viewvc?rev=1163886&view=rev
Log:
GIRAPH-24: Job-level statistics reports one superstep greater than workers.
(jghoman)
Modified:
incubator/giraph/trunk/CHANGELOG
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
Modified: incubator/giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/giraph/trunk/CHANGELOG?rev=1163886&r1=1163885&r2=1163886&view=diff
==============================================================================
--- incubator/giraph/trunk/CHANGELOG (original)
+++ incubator/giraph/trunk/CHANGELOG Thu Sep 1 01:19:41 2011
@@ -2,6 +2,9 @@ Giraph Change Log
Release 0.70.0 - unreleased
+ GIRAPH-24. Job-level statistics reports one superstep greater than
+ workers. (jghoman)
+
GIRAPH-18. Refactor BspServiceWorker::loadVertices(). (jghoman)
GIRAPH-14. Support for the Facebook Hadoop branch. (aching)
Modified:
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
URL:
http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java?rev=1163886&r1=1163885&r2=1163886&view=diff
==============================================================================
---
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
(original)
+++
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/BspServiceMaster.java
Thu Sep 1 01:19:41 2011
@@ -1779,7 +1779,9 @@ public class BspServiceMaster<
}
}
incrCachedSuperstep();
- superstepCounter.increment(1);
+ if(getSuperstep() > 0) { // counter starts at zero, so no need to incr
+ superstepCounter.increment(1);
+ }
try {
if ((globalInfoObject.getLong(JSONOBJ_FINISHED_VERTICES_KEY) ==
globalInfoObject.getLong(JSONOBJ_NUM_VERTICES_KEY)) &&
