Repository: tez Updated Branches: refs/heads/master 9710575b1 -> 980385ab6
TEZ-3128. Avoid stopping containers on the AM shutdown thread. Contributed by Tsuyoshi Ozawa. Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/980385ab Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/980385ab Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/980385ab Branch: refs/heads/master Commit: 980385ab6670abf62d65c5679abee2af3bda0183 Parents: 9710575 Author: Siddharth Seth <[email protected]> Authored: Fri Feb 26 10:11:01 2016 -0800 Committer: Siddharth Seth <[email protected]> Committed: Fri Feb 26 10:11:01 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../tez/dag/app/launcher/TezContainerLauncherImpl.java | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/980385ab/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a925de7..9800072 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-3128. Avoid stopping containers on the AM shutdown thread. TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException TEZ-3114. Shuffle OOM due to EventMetaData flood TEZ-1911. MergeManager's unconditionalReserve() should check for memory limits before allocating. http://git-wip-us.apache.org/repos/asf/tez/blob/980385ab/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java index d384aef..1521dcb 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/TezContainerLauncherImpl.java @@ -303,22 +303,12 @@ public class TezContainerLauncherImpl extends ContainerLauncher { eventHandlingThread.start(); } - private void shutdownAllContainers() { - for (Container ct : this.containers.values()) { - if (ct != null) { - ct.kill(); - } - } - } - @Override public void shutdown() { if(!serviceStopped.compareAndSet(false, true)) { LOG.info("Ignoring multiple stops"); return; } - // shutdown any containers that might be left running - shutdownAllContainers(); if (eventHandlingThread != null) { eventHandlingThread.interrupt(); }
