hadoop git commit: YARN-5049. Addendum patch for branch-2. (asuresh)

[asuresh]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9.0 23b3efe31 -> 1eb05c1dd


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

(cherry picked from commit c153bed6e3b38d60815c3f62d96c604f23116eb3)


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

Branch: refs/heads/branch-2.9.0
Commit: 1eb05c1dd48fbc9e4b375a76f2046a59103bbeb1
Parents: 23b3efe
Author: Arun Suresh 
Authored: Sun Nov 12 10:16:00 2017 -0800
Committer: Arun Suresh 
Committed: Sun Nov 12 10:17:40 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1eb05c1d/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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5049. Addendum patch for branch-2. (asuresh)

[asuresh]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 45c5b7f71 -> 238a70c6c


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

(cherry picked from commit c153bed6e3b38d60815c3f62d96c604f23116eb3)


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

Branch: refs/heads/branch-2.9
Commit: 238a70c6c3b490dd44a780a3b4919c289ffd0dbb
Parents: 45c5b7f
Author: Arun Suresh 
Authored: Sun Nov 12 10:16:00 2017 -0800
Committer: Arun Suresh 
Committed: Sun Nov 12 10:17:01 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/238a70c6/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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5049. Addendum patch for branch-2. (asuresh)

[asuresh]

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 
Authored: Sun Nov 12 10:16:00 2017 -0800
Committer: Arun Suresh 
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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org