Repository: hadoop Updated Branches: refs/heads/branch-2.8 e2762f035 -> c1953e5e9
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/c1953e5e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c1953e5e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c1953e5e Branch: refs/heads/branch-2.8 Commit: c1953e5e9107e4b9ca2419f439d6f8bd34249655 Parents: e2762f0 Author: Jason Lowe <jl...@apache.org> Authored: Fri Jan 22 21:55:01 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Fri Jan 22 21:56:37 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/c1953e5e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index fc37a72..7dbc71a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1236,6 +1236,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 @@ -2108,6 +2111,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/c1953e5e/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 e16ea93..6186b94 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))
