From 635849fa453ee9b6de7ec7ebd287a567b6152e9f Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Fri, 22 Jan 2016 21:55:01 +0000 Subject: [PATCH] YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen (cherry picked from commit 46e5ea81e0e41646ba02391aea31481ead28aaf8) --- hadoop-yarn-project/CHANGES.txt | 6 ++++++ .../containermanager/container/ContainerImpl.java | 1 + 2 files changed, 7 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 4f4fe7c6e67..441417bd0db 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 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 3c49489fdb9..fb1728a233b 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))