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 2016/02/29 19:52:51 UTC
tez git commit: TEZ-2988. DAGAppMaster::shutdownTezAM should return
with a no-op if it has been invoked earlier. (Tsuyoshi Ozawa via hitesh)
Repository: tez
Updated Branches:
refs/heads/master 18398c805 -> dd7919061
TEZ-2988. DAGAppMaster::shutdownTezAM should return with a no-op if it has been invoked earlier. (Tsuyoshi Ozawa via hitesh)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/dd791906
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/dd791906
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/dd791906
Branch: refs/heads/master
Commit: dd7919061cd64accb08782d1fc3f58635d64fa72
Parents: 18398c8
Author: Hitesh Shah <hi...@apache.org>
Authored: Mon Feb 29 10:52:27 2016 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Mon Feb 29 10:52:27 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/dd791906/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index adc84ea..6b73fc6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
TEZ-3029. Add an onError method to service plugin contexts.
ALL CHANGES:
+ TEZ-2988. DAGAppMaster::shutdownTezAM should return with a no-op if it has been invoked earlier.
TEZ-3147. Intermediate mem-to-mem: Fix early exit when only one segment can fit into memory
TEZ-3141. mapreduce.task.timeout is not translated to container heartbeat timeout
TEZ-3128. Avoid stopping containers on the AM shutdown thread.
@@ -392,6 +393,7 @@ INCOMPATIBLE CHANGES
TEZ-2949. Allow duplicate dag names within session for Tez.
ALL CHANGES:
+ TEZ-2988. DAGAppMaster::shutdownTezAM should return with a no-op if it has been invoked earlier.
TEZ-3141. mapreduce.task.timeout is not translated to container heartbeat timeout
TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException
TEZ-3114. Shuffle OOM due to EventMetaData flood
http://git-wip-us.apache.org/repos/asf/tez/blob/dd791906/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 5ac3800..81a7791 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
@@ -1294,7 +1294,11 @@ public class DAGAppMaster extends AbstractService {
}
public void shutdownTezAM(String dagKillmessage) throws TezException {
- sessionStopped.set(true);
+ if (!sessionStopped.compareAndSet(false, true)) {
+ // No need to shutdown twice.
+ // Return with a no-op if shutdownTezAM has been invoked earlier.
+ return;
+ }
synchronized (this) {
this.taskSchedulerManager.setShouldUnregisterFlag();
if (currentDAG != null