Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 83fd33d5f -> 9601a3b2c
YARN-4598. Invalid event: RESOURCE_FAILED at CONTAINER_CLEANEDUP_AFTER_KILL.
Contributed by tangshangwen
(cherry picked from commit 46e5ea81e0e41646ba02391aea31481ead28aaf8)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9601a3b2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9601a3b2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9601a3b2
Branch: refs/heads/branch-2.7
Commit: 9601a3b2ce505305578ad5cd3fedcc157115562e
Parents: 83fd33d
Author: Jason Lowe <[email protected]>
Authored: Fri Jan 22 21:58:12 2016 +0000
Committer: Jason Lowe <[email protected]>
Committed: Fri Jan 22 21:58:12 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/9601a3b2/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0b6b5ae..75902ef 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -75,6 +75,9 @@ Release 2.7.3 - UNRELEASED
YARN-4623.
TestSystemMetricsPublisher#testPublishAppAttemptMetricsForUnmanagedAM
fails with NPE on branch-2.7. (Naganarasimha G R via junping_du)
+ YARN-4598. Invalid event: RESOURCE_FAILED at
+ CONTAINER_CLEANEDUP_AFTER_KILL (tangshangwen via jlowe)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -952,6 +955,9 @@ Release 2.6.4 - UNRELEASED
YARN-4414. Nodemanager connection errors are retried at multiple levels
(Chang Li via jlowe)
+ 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/9601a3b2/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 f55e0e5..7f1fdc3 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
@@ -320,6 +320,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))
