You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2014/08/18 19:32:03 UTC
git commit: TEZ-1445. Add more logging to catch shutdown handler race
conditions. (hitesh)
Repository: tez
Updated Branches:
refs/heads/master 16fdf1bbb -> 1448b61bb
TEZ-1445. Add more logging to catch shutdown handler race conditions. (hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/1448b61b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/1448b61b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/1448b61b
Branch: refs/heads/master
Commit: 1448b61bb399eb1cce074b3f5dbfa74a83c09c9d
Parents: 16fdf1b
Author: Hitesh Shah <hi...@apache.org>
Authored: Mon Aug 18 10:31:39 2014 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Mon Aug 18 10:31:39 2014 -0700
----------------------------------------------------------------------
tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java | 5 ++++-
tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/1448b61b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
index be9e28d..469da90 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java
@@ -590,7 +590,9 @@ public class DAGAppMaster extends AbstractService {
return;
}
- shutdownHandlerRunning.set(true);
+ synchronized (shutdownHandlerRunning) {
+ shutdownHandlerRunning.set(true);
+ }
LOG.info("Handling DAGAppMaster shutdown");
AMShutdownRunnable r = new AMShutdownRunnable(now);
@@ -1750,6 +1752,7 @@ public class DAGAppMaster extends AbstractService {
if (appMaster.shutdownHandlerRunning.get()) {
LOG.info("The shutdown handler is still running, waiting for it to complete");
appMaster.shutdownHandlerRunning.wait();
+ LOG.info("The shutdown handler has completed");
}
} catch (InterruptedException e) {
// Ignore
http://git-wip-us.apache.org/repos/asf/tez/blob/1448b61b/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java b/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java
index c6273ec..132626a 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestTezJobs.java
@@ -100,6 +100,11 @@ public class TestTezJobs {
@AfterClass
public static void tearDown() {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ // Ignore
+ }
if (mrrTezCluster != null) {
mrrTezCluster.stop();
mrrTezCluster = null;