Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4831. Recovered containers will be killed after NM stateful restart. Contributed by Siqi Li 

(cherry picked from commit 7e3c327d31)
This commit is contained in:
Jason Lowe 2016-10-27 20:41:43 +00:00
parent 2cf3138d72
commit e50215306d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
View File

@ -1496,6 +1496,9 @@ public class ContainerImpl implements Container {
static class KillOnNewTransition extends ContainerDoneTransition { static class KillOnNewTransition extends ContainerDoneTransition {
@Override @Override
public void transition(ContainerImpl container, ContainerEvent event) { public void transition(ContainerImpl container, ContainerEvent event) {
if (container.recoveredStatus == RecoveredContainerStatus.COMPLETED) {
container.sendFinishedEvents();
} else {
ContainerKillEvent killEvent = (ContainerKillEvent) event; ContainerKillEvent killEvent = (ContainerKillEvent) event;
container.exitCode = killEvent.getContainerExitStatus(); container.exitCode = killEvent.getContainerExitStatus();
container.addDiagnostics(killEvent.getDiagnostic(), "\n"); container.addDiagnostics(killEvent.getDiagnostic(), "\n");
@ -1508,6 +1511,7 @@ public class ContainerImpl implements Container {
super.transition(container, event); super.transition(container, event);
} }
} }
}
/** /**
* Handle the following transition: * Handle the following transition: