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/10/27 20:44:37 UTC
hadoop git commit: YARN-4831. Recovered containers will be killed
after NM stateful restart. Contributed by Siqi Li (cherry picked from commit
7e3c327d316b33d6a09bfd4e65e7e5384943bb1d)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 2cf3138d7 -> e50215306
YARN-4831. Recovered containers will be killed after NM stateful restart. Contributed by Siqi Li
(cherry picked from commit 7e3c327d316b33d6a09bfd4e65e7e5384943bb1d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5021530
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5021530
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5021530
Branch: refs/heads/branch-2
Commit: e50215306d4483ac9159669e68febd67c7bce2cf
Parents: 2cf3138
Author: Jason Lowe <jl...@apache.org>
Authored: Thu Oct 27 20:41:43 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Thu Oct 27 20:44:17 2016 +0000
----------------------------------------------------------------------
.../container/ContainerImpl.java | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5021530/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 6631d3a..6caa418 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
@@ -1496,16 +1496,20 @@ public class ContainerImpl implements Container {
static class KillOnNewTransition extends ContainerDoneTransition {
@Override
public void transition(ContainerImpl container, ContainerEvent event) {
- ContainerKillEvent killEvent = (ContainerKillEvent) event;
- container.exitCode = killEvent.getContainerExitStatus();
- container.addDiagnostics(killEvent.getDiagnostic(), "\n");
- container.addDiagnostics("Container is killed before being launched.\n");
- container.metrics.killedContainer();
- NMAuditLogger.logSuccess(container.user,
- AuditConstants.FINISH_KILLED_CONTAINER, "ContainerImpl",
- container.containerId.getApplicationAttemptId().getApplicationId(),
- container.containerId);
- super.transition(container, event);
+ if (container.recoveredStatus == RecoveredContainerStatus.COMPLETED) {
+ container.sendFinishedEvents();
+ } else {
+ ContainerKillEvent killEvent = (ContainerKillEvent) event;
+ container.exitCode = killEvent.getContainerExitStatus();
+ container.addDiagnostics(killEvent.getDiagnostic(), "\n");
+ container.addDiagnostics("Container is killed before being launched.\n");
+ container.metrics.killedContainer();
+ NMAuditLogger.logSuccess(container.user,
+ AuditConstants.FINISH_KILLED_CONTAINER, "ContainerImpl",
+ container.containerId.getApplicationAttemptId().getApplicationId(),
+ container.containerId);
+ super.transition(container, event);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org