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 2017/03/31 03:43:58 UTC
git commit: updated refs/heads/trunk to e354e06
Repository: giraph
Updated Branches:
refs/heads/trunk ba8c6e130 -> e354e067e
Fix #27
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/e354e067
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/e354e067
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/e354e067
Branch: refs/heads/trunk
Commit: e354e067ea6b5d099db609aff76a199a81e92d12
Parents: ba8c6e1
Author: Maja Kabiljo <ma...@fb.com>
Authored: Thu Mar 30 20:43:30 2017 -0700
Committer: Maja Kabiljo <ma...@fb.com>
Committed: Thu Mar 30 20:43:30 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/giraph/graph/GraphTaskManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/e354e067/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 ac787cc..1967b44 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
@@ -260,7 +260,7 @@ end[PURE_YARN]*/
context
.setStatus("setup: Connected to Zookeeper service " + serverPortList);
this.graphFunctions = determineGraphFunctions(conf, zkManager);
- if (this.graphFunctions.isMaster()) {
+ if (zkManager != null && this.graphFunctions.isMaster()) {
zkManager.cleanupOnExit();
}
try {