You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2016/01/22 22:56:30 UTC
hadoop git commit: YARN-4598. Invalid event: RESOURCE_FAILED at
CONTAINER_CLEANEDUP_AFTER_KILL. Contributed by tangshangwen (cherry picked
from commit 46e5ea81e0e41646ba02391aea31481ead28aaf8)
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 <jl...@apache.org>
Authored: Fri Jan 22 21:55:01 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
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))