You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2015/06/05 02:04:06 UTC
tez git commit: TEZ-2533. AM deadlock when shutdown (zjffdu)
Repository: tez
Updated Branches:
refs/heads/master fa5ae1ac2 -> 56f157ef1
TEZ-2533. AM deadlock when shutdown (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/56f157ef
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/56f157ef
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/56f157ef
Branch: refs/heads/master
Commit: 56f157ef11cd97c0e4f2de20a9bd7b113104b5db
Parents: fa5ae1a
Author: Jeff Zhang <zj...@apache.org>
Authored: Fri Jun 5 08:03:58 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Fri Jun 5 08:03:58 2015 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/main/java/org/apache/tez/dag/app/DAGAppMaster.java | 8 +++-----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/56f157ef/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4a6a97c..b582349 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -425,6 +425,7 @@ TEZ-UI CHANGES (TEZ-8):
Release 0.5.4: Unreleased
ALL CHANGES:
+ TEZ-2533. AM deadlock when shutdown
TEZ-2537. mapreduce.map.env and mapreduce.reduce.env need to fall back to mapred.child.env for compatibility
TEZ-2304. InvalidStateTransitonException TA_SCHEDULE at START_WAIT during recovery
TEZ-2488. Tez AM crashes if a submitted DAG is configured to use invalid resource sizes.
http://git-wip-us.apache.org/repos/asf/tez/blob/56f157ef/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 b2c77dc..fa4c42d 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
@@ -838,19 +838,17 @@ public class DAGAppMaster extends AbstractService {
// This will also send the final report to the ResourceManager
LOG.info("Calling stop for all the services");
stop();
-
+ } catch (Throwable t) {
+ LOG.warn("Graceful stop failed ", t);
+ } finally {
synchronized (shutdownHandlerRunning) {
shutdownHandlerRunning.set(false);
shutdownHandlerRunning.notify();
}
-
//Bring the process down by force.
//Not needed after HADOOP-7140
LOG.info("Exiting DAGAppMaster..GoodBye!");
sysexit();
-
- } catch (Throwable t) {
- LOG.warn("Graceful stop failed ", t);
}
}
}