tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject tez git commit: TEZ-2533. AM deadlock when shutdown (zjffdu)
Date Fri, 05 Jun 2015 00:08:26 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 557a5118c -> 9538b0ff4


TEZ-2533. AM deadlock when shutdown (zjffdu)

(cherry picked from commit 56f157ef11cd97c0e4f2de20a9bd7b113104b5db)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9538b0ff
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9538b0ff
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9538b0ff

Branch: refs/heads/branch-0.6
Commit: 9538b0ff47da68f7c75a78411a932107c15dad0c
Parents: 557a511
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Fri Jun 5 08:03:58 2015 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Fri Jun 5 08:08:12 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/9538b0ff/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1e0c232..652e9e9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -202,6 +202,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/9538b0ff/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 77cd846..cbb875f 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
@@ -728,19 +728,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);
         }
       }
     }


Mime
View raw message