hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asur...@apache.org
Subject hadoop git commit: YARN-5049. Addendum patch for branch-2. (asuresh)
Date Sun, 12 Nov 2017 18:16:20 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 90ac8cd5a -> c153bed6e


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c153bed6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c153bed6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c153bed6

Branch: refs/heads/branch-2
Commit: c153bed6e3b38d60815c3f62d96c604f23116eb3
Parents: 90ac8cd
Author: Arun Suresh <asuresh@apache.org>
Authored: Sun Nov 12 10:16:00 2017 -0800
Committer: Arun Suresh <asuresh@apache.org>
Committed: Sun Nov 12 10:16:00 2017 -0800

----------------------------------------------------------------------
 .../nodemanager/containermanager/ContainerManagerImpl.java  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c153bed6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.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/ContainerManagerImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
index 1aaab30..6f993a4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java
@@ -465,20 +465,13 @@ public class ContainerManagerImpl extends CompositeService implements
 
     Application app = context.getApplications().get(appId);
     if (app != null) {
-      Credentials credentials =
-          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));
+      recoverActiveContainer(launchContext, token, rcs);
       if (rcs.getRecoveryType() == RecoveredContainerType.KILL) {
         dispatcher.getEventHandler().handle(
             new ContainerKillEvent(containerId, ContainerExitStatus.ABORTED,
                 "Due to invalid StateStore info container was killed"
                     + " during recovery"));
       }
-      recoverActiveContainer(launchContext, token, rcs);
     } else {
       if (rcs.getStatus() != RecoveredContainerStatus.COMPLETED) {
         LOG.warn(containerId + " has no corresponding application!");


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message