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

YARN-5049. Addendum patch for branch-2. (asuresh)

Browse Source
This commit is contained in:
Arun Suresh 2017-11-12 10:16:00 -08:00
parent 90ac8cd5a1
commit c153bed6e3
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
View File

@ -465,20 +465,13 @@ private void recoverContainer(RecoveredContainerState rcs)
Application app = context.getApplications().get(appId); Application app = context.getApplications().get(appId);
if (app != null) { if (app != null) {
Credentials credentials = recoverActiveContainer(launchContext, token, rcs);
YarnServerSecurityUtils.parseCredentials(launchContext);
Container container = new ContainerImpl(getConfig(), dispatcher,
req.getContainerLaunchContext(),
credentials, metrics, token, context, rcs);
context.getContainers().put(containerId, container);
app.handle(new ApplicationContainerInitEvent(container));
if (rcs.getRecoveryType() == RecoveredContainerType.KILL) { if (rcs.getRecoveryType() == RecoveredContainerType.KILL) {
dispatcher.getEventHandler().handle( dispatcher.getEventHandler().handle(
new ContainerKillEvent(containerId, ContainerExitStatus.ABORTED, new ContainerKillEvent(containerId, ContainerExitStatus.ABORTED,
"Due to invalid StateStore info container was killed" "Due to invalid StateStore info container was killed"
+ " during recovery")); + " during recovery"));
} }
recoverActiveContainer(launchContext, token, rcs);
} else { } else {
if (rcs.getStatus() != RecoveredContainerStatus.COMPLETED) { if (rcs.getStatus() != RecoveredContainerStatus.COMPLETED) {
LOG.warn(containerId + " has no corresponding application!"); LOG.warn(containerId + " has no corresponding application!");