Repository: giraph Updated Branches: refs/heads/trunk 6cb6acb44 -> 1ca322207
GIRAPH-1021: Missing progress report for graph mutations Fix progress report for graph mutations Summary: Progress report in the new implementation of graph mutation is missing. This can cause lack of progress errors at runtime for mutations on high degree vertices Test Plan: mvn clean verify Reviewers: avery.ching, dionysis.logothetis, maja.kabiljo, sergey.edunov Differential Revision: https://reviews.facebook.net/D42309 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/1ca32220 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/1ca32220 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/1ca32220 Branch: refs/heads/trunk Commit: 1ca3222078064fe4bc1f92fc94a58cafa39f2643 Parents: 6cb6acb Author: Hassan Eslami <[email protected]> Authored: Thu Jul 16 15:48:26 2015 -0700 Committer: Avery Ching <[email protected]> Committed: Thu Jul 16 15:55:19 2015 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/comm/ServerData.java | 6 ++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/1ca32220/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index e728810..fd31545 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Giraph Change Log Release 1.2.0 - unreleased ======= + GIRAPH-1021: Missing progress report for graph mutations. (heslami via aching) + GIRAPH-1020: TaskInfo equality condition. (heslami via aching) GIRAPH-1019: Optimizing and debugging vertex mutation. (heslami via aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/1ca32220/giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java b/giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java index 62e58c5..8269998 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java @@ -118,6 +118,9 @@ public class ServerData<I extends WritableComparable, private volatile List<Writable> incomingWorkerToWorkerMessages = Collections.synchronizedList(new ArrayList<Writable>()); + /** Job context (for progress) */ + private final Mapper<?, ?, ?, ?>.Context context; + /** * Constructor. * @@ -148,6 +151,7 @@ public class ServerData<I extends WritableComparable, edgeStore = edgeStoreFactory.newStore(); ownerAggregatorData = new OwnerAggregatorServerData(context); allAggregatorData = new AllAggregatorServerData(context, conf); + this.context = context; } public EdgeStore<I, V, E> getEdgeStore() { @@ -353,6 +357,7 @@ public class ServerData<I extends WritableComparable, "vertex due to a mutation"); } } + context.progress(); } } @@ -377,6 +382,7 @@ public class ServerData<I extends WritableComparable, if (vertex != null) { partition.putVertex(vertex); } + context.progress(); } } }
