You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ed...@apache.org on 2017/03/15 17:01:12 UTC
git commit: updated refs/heads/trunk to 3dbd158
Repository: giraph
Updated Branches:
refs/heads/trunk 9c2d135bb -> 3dbd158c7
closes #25
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/3dbd158c
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/3dbd158c
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/3dbd158c
Branch: refs/heads/trunk
Commit: 3dbd158c7b0b1df5785d3a395a3ae058b7867381
Parents: 9c2d135
Author: Sergey Edunov <ed...@fb.com>
Authored: Wed Mar 15 10:00:58 2017 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Wed Mar 15 10:00:58 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/giraph/graph/GraphTaskManager.java | 2 ++
.../src/main/java/org/apache/giraph/master/BspServiceMaster.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/3dbd158c/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 19bbdc7..ca7226f 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
@@ -625,6 +625,8 @@ end[PURE_YARN]*/
}
serviceMaster = new BspServiceMaster<I, V, E>(context, this);
masterThread = new MasterThread<I, V, E>(serviceMaster, context);
+ masterThread.setUncaughtExceptionHandler(
+ createUncaughtExceptionHandler());
masterThread.start();
}
if (graphFunctions.isWorker()) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/3dbd158c/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 6b64cf5..da1374a 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
@@ -1835,7 +1835,7 @@ public class BspServiceMaster<I extends WritableComparable,
}
getCleanedUpChildrenChangedEvent().waitForTimeoutOrFail(
- GiraphConstants.WAIT_ZOOKEEPER_TIMEOUT_MSEC.get(
+ GiraphConstants.WAIT_FOR_OTHER_WORKERS_TIMEOUT_MSEC.get(
getConfiguration()));
getCleanedUpChildrenChangedEvent().reset();
}