From d971bf252f36e902a0fe446cb11201835ad16bcb Mon Sep 17 00:00:00 2001
From: Arun Suresh <asuresh@apache.org>
Date: Tue, 10 May 2016 22:31:38 -0700
Subject: [PATCH] YARN-5073. Refactor startContainerInternal() in
 ContainerManager to remove unused parameter. (Konstantinos Karanasos via
 asuresh)

---
 .../containermanager/ContainerManagerImpl.java   |  5 ++---
 .../queuing/QueuingContainerManagerImpl.java     | 16 ++++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

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 162823c9cd..516ef907e0 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
@@ -811,8 +811,7 @@ public StartContainersResponse startContainers(
           }
           performContainerPreStartChecks(nmTokenIdentifier, request,
               containerTokenIdentifier);
-          startContainerInternal(nmTokenIdentifier, containerTokenIdentifier,
-              request);
+          startContainerInternal(containerTokenIdentifier, request);
           succeededContainers.add(containerId);
         } catch (YarnException e) {
           failedContainers.put(containerId, SerializedException.newInstance(e));
@@ -908,7 +907,7 @@ private ContainerManagerApplicationProto buildAppProto(ApplicationId appId,
   }
 
   @SuppressWarnings("unchecked")
-  protected void startContainerInternal(NMTokenIdentifier nmTokenIdentifier,
+  protected void startContainerInternal(
       ContainerTokenIdentifier containerTokenIdentifier,
       StartContainerRequest request) throws YarnException, IOException {
 
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/queuing/QueuingContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/QueuingContainerManagerImpl.java
index ef4e57146c..663dd3bde2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/QueuingContainerManagerImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/queuing/QueuingContainerManagerImpl.java
@@ -101,14 +101,14 @@ protected EventHandler<ApplicationEvent> createApplicationEventDispatcher() {
   }
 
   @Override
-  protected void startContainerInternal(NMTokenIdentifier nmTokenIdentifier,
+  protected void startContainerInternal(
       ContainerTokenIdentifier containerTokenIdentifier,
       StartContainerRequest request) throws YarnException, IOException {
     this.context.getQueuingContext().getQueuedContainers().put(
         containerTokenIdentifier.getContainerID(), containerTokenIdentifier);
 
     AllocatedContainerInfo allocatedContInfo = new AllocatedContainerInfo(
-        containerTokenIdentifier, nmTokenIdentifier, request,
+        containerTokenIdentifier, request,
         containerTokenIdentifier.getExecutionType(), containerTokenIdentifier
             .getResource(), getConfig());
 
@@ -189,7 +189,6 @@ private void startAllocatedContainer(
     this.context.getQueuingContext().getQueuedContainers().remove(containerId);
     try {
       super.startContainerInternal(
-          allocatedContainerInfo.getNMTokenIdentifier(),
           allocatedContainerInfo.getContainerTokenIdentifier(),
           allocatedContainerInfo.getStartRequest());
     } catch (YarnException | IOException e) {
@@ -467,7 +466,6 @@ public QueuingApplicationEventDispatcher(
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void handle(ApplicationEvent event) {
       if (event.getType() ==
           ApplicationEventType.APPLICATION_CONTAINER_FINISHED) {
@@ -489,16 +487,14 @@ public void handle(ApplicationEvent event) {
 
   static class AllocatedContainerInfo {
     private final ContainerTokenIdentifier containerTokenIdentifier;
-    private final NMTokenIdentifier nmTokenIdentifier;
     private final StartContainerRequest startRequest;
     private final ExecutionType executionType;
     private final ProcessTreeInfo pti;
 
     AllocatedContainerInfo(ContainerTokenIdentifier containerTokenIdentifier,
-        NMTokenIdentifier nmTokenIdentifier, StartContainerRequest startRequest,
-        ExecutionType executionType, Resource resource, Configuration conf) {
+        StartContainerRequest startRequest, ExecutionType executionType,
+        Resource resource, Configuration conf) {
       this.containerTokenIdentifier = containerTokenIdentifier;
-      this.nmTokenIdentifier = nmTokenIdentifier;
       this.startRequest = startRequest;
       this.executionType = executionType;
       this.pti = createProcessTreeInfo(containerTokenIdentifier
@@ -509,10 +505,6 @@ private ContainerTokenIdentifier getContainerTokenIdentifier() {
       return this.containerTokenIdentifier;
     }
 
-    private NMTokenIdentifier getNMTokenIdentifier() {
-      return this.nmTokenIdentifier;
-    }
-
     private StartContainerRequest getStartRequest() {
       return this.startRequest;
     }