closes #25

apache · Mar 15, 2017 · 3dbd158 · 3dbd158
1 parent 9c2d135
commit 3dbd158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
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
@@ -625,6 +625,8 @@ private void instantiateBspService()
       }
       serviceMaster = new BspServiceMaster<I, V, E>(context, this);
       masterThread = new MasterThread<I, V, E>(serviceMaster, context);
+      masterThread.setUncaughtExceptionHandler(
+          createUncaughtExceptionHandler());
       masterThread.start();
     }
     if (graphFunctions.isWorker()) {

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
@@ -1835,7 +1835,7 @@ private void cleanUpZooKeeper() {
       }
 
       getCleanedUpChildrenChangedEvent().waitForTimeoutOrFail(
-          GiraphConstants.WAIT_ZOOKEEPER_TIMEOUT_MSEC.get(
+          GiraphConstants.WAIT_FOR_OTHER_WORKERS_TIMEOUT_MSEC.get(
               getConfiguration()));
       getCleanedUpChildrenChangedEvent().reset();
     }