Revert "Numa support in DCE"

This reverts commit 571a0657ccfbae3ef9dc0bd1dddc032008b45f91.

Author: Samrat002

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java

@@ -20,9 +20,7 @@
 
 import static org.apache.hadoop.fs.CreateFlag.CREATE;
 import static org.apache.hadoop.fs.CreateFlag.OVERWRITE;
-import static org.apache.hadoop.yarn.conf.YarnConfiguration.numaAwarenessEnabled;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.hadoop.classification.VisibleForTesting;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -57,9 +55,6 @@
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.Container;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.container.ContainerDiagnosticsUpdateEvent;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher.ContainerLaunch;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.ResourceHandlerException;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.numa.NumaResourceAllocation;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.linux.resources.numa.NumaResourceAllocator;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ContainerLocalizer;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.runtime.ContainerExecutionException;
 import org.apache.hadoop.yarn.server.nodemanager.executor.ContainerExecContext;
@@ -140,10 +135,9 @@ protected void setScriptExecutable(Path script, String owner)
     lfs.setPermission(script, ContainerExecutor.TASK_LAUNCH_SCRIPT_PERMISSION);
   }
 
-  private NumaResourceAllocator numaResourceAllocator;
   @Override
   public void init(Context nmContext) throws IOException {
-    numaResourceAllocator = new NumaResourceAllocator(nmContext);
+    // nothing to do or verify here
   }
 
   @Override
@@ -215,11 +209,10 @@ protected ContainerLocalizer createContainerLocalizer(String user,
     return localizer;
   }
 
-  private volatile Container container;
   @Override
   public int launchContainer(ContainerStartContext ctx)
       throws IOException, ConfigurationException {
-    container = ctx.getContainer();
+    Container container = ctx.getContainer();
     Path nmPrivateContainerScriptPath = ctx.getNmPrivateContainerScriptPath();
     Path nmPrivateTokensPath = ctx.getNmPrivateTokensPath();
     Path nmPrivateKeystorePath = ctx.getNmPrivateKeystorePath();
@@ -389,9 +382,6 @@ protected CommandExecutor buildCommandExecutor(String wrapperScriptPath,
     String[] command = getRunCommand(wrapperScriptPath,
         containerIdStr, user, pidFile, this.getConf(), resource);
 
-    if(numaAwarenessEnabled(this.getConf())) {
-      addNumaCommands(command, container);
-    }
     LOG.info("launchContainer: {}", Arrays.toString(command));
     return new ShellCommandExecutor(
         command,
@@ -401,26 +391,6 @@ protected CommandExecutor buildCommandExecutor(String wrapperScriptPath,
         false);
   }
 
-
-  private void addNumaCommands(String[] commands, Container container){
-    try {
-      NumaResourceAllocation numaAllocation = numaResourceAllocator.allocateNumaNodes(container);
-      if(numaAllocation != null){
-        String[] numaCommand = new String[3];
-        numaCommand[0] = this.getConf().get(YarnConfiguration.NM_NUMA_AWARENESS_NUMACTL_CMD,
-                YarnConfiguration.DEFAULT_NM_NUMA_AWARENESS_NUMACTL_CMD);;
-        numaCommand[1] = "--interleave=" + String.join(",", numaAllocation.getMemNodes());
-        numaCommand[2] = "--cpunodebind=" + String.join(",", numaAllocation.getCpuNodes());
-        ArrayUtils.add(commands, numaCommand);
-      }
-    } catch (ResourceHandlerException e){
-      LOG.warn("Exception assigning numa :- ",  e);
-    }
-
-
-
-  }
-
   /**
    * Create a {@link LocalWrapperScriptBuilder} for the given container ID
    * and path that is appropriate to the current platform.