Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 430F518D5A for ; Fri, 22 Jan 2016 21:56:36 +0000 (UTC) Received: (qmail 84058 invoked by uid 500); 22 Jan 2016 21:56:31 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 83993 invoked by uid 500); 22 Jan 2016 21:56:31 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 83984 invoked by uid 99); 22 Jan 2016 21:56:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jan 2016 21:56:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA3C9E0098; Fri, 22 Jan 2016 21:56:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen (cherry picked from commit 46e5ea81e0e41646ba02391aea31481ead28aaf8) Date: Fri, 22 Jan 2016 21:56:30 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 ad84f90e8 -> 635849fa4 YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen (cherry picked from commit 46e5ea81e0e41646ba02391aea31481ead28aaf8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/635849fa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/635849fa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/635849fa Branch: refs/heads/branch-2 Commit: 635849fa453ee9b6de7ec7ebd287a567b6152e9f Parents: ad84f90 Author: Jason Lowe Authored: Fri Jan 22 21:55:01 2016 +0000 Committer: Jason Lowe Committed: Fri Jan 22 21:55:59 2016 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 6 ++++++ .../nodemanager/containermanager/container/ContainerImpl.java | 1 + 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/635849fa/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4f4fe7c..441417b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1334,6 +1334,9 @@ Release 2.7.3 - UNRELEASED YARN-4610. Reservations continue looking for one app causes other apps to starve (jlowe) + YARN-4598. Invalid event: RESOURCE_FAILED at + CONTAINER_CLEANEDUP_AFTER_KILL (tangshangwen via jlowe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES @@ -2229,6 +2232,9 @@ Release 2.6.4 - UNRELEASED YARN-4581. AHS writer thread leak makes RM crash while RM is recovering. (sandflee via junping_du) + YARN-4598. Invalid event: RESOURCE_FAILED at + CONTAINER_CLEANEDUP_AFTER_KILL (tangshangwen via jlowe) + Release 2.6.3 - 2015-12-17 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/635849fa/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 3c49489..fb1728a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -328,6 +328,7 @@ public class ContainerImpl implements Container { .addTransition(ContainerState.CONTAINER_CLEANEDUP_AFTER_KILL, ContainerState.CONTAINER_CLEANEDUP_AFTER_KILL, EnumSet.of(ContainerEventType.KILL_CONTAINER, + ContainerEventType.RESOURCE_FAILED, ContainerEventType.CONTAINER_EXITED_WITH_SUCCESS, ContainerEventType.CONTAINER_EXITED_WITH_FAILURE))