azkaban-developers
Merge pull request #424 from johnyu0520/master FlowRunnerManager.CleanerThread …
4/27/2015 3:50:52 PM
Changes
Details
diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
index d052d99..124b5c0 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunnerManager.java
@@ -316,6 +316,8 @@ public class FlowRunnerManager implements EventListener,
wait(RECENTLY_FINISHED_TIME_TO_LIVE);
} catch (InterruptedException e) {
logger.info("Interrupted. Probably to shut down.");
+ } catch (Throwable t){
+ logger.warn("Uncaught throwable, please look into why it is not caught", t);
}
}
}
diff --git a/azkaban-execserver/src/test/java/azkaban/execapp/event/BlockingStatusTest.java b/azkaban-execserver/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
index 87c668d..cd20f42 100644
--- a/azkaban-execserver/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
+++ b/azkaban-execserver/src/test/java/azkaban/execapp/event/BlockingStatusTest.java
@@ -124,7 +124,7 @@ public class BlockingStatusTest {
System.out.println("Diff thread 1 " + thread1.getDiff());
System.out.println("Diff thread 2 " + thread2.getDiff());
- Assert.assertTrue(thread1.getDiff() >= 4000 && thread1.getDiff() < 4100);
- Assert.assertTrue(thread2.getDiff() >= 2000 && thread2.getDiff() < 2100);
+ Assert.assertTrue(thread1.getDiff() >= 4000 && thread1.getDiff() < 4200);
+ Assert.assertTrue(thread2.getDiff() >= 2000 && thread2.getDiff() < 2200);
}
}