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:09:37 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 66ee8e8f5 -> 6c305bfa6


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/6c305bfa
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6c305bfa
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6c305bfa

Branch: refs/heads/branch-0.5
Commit: 6c305bfa6b78140cfb8fb60f4b96f4a6c830c841
Parents: 66ee8e8
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:09:05 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/6c305bfa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c9da0b3..d95a442 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 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/6c305bfa/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 df1ac8b..6343f6e 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
@@ -697,19 +697,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