Revert "YARN-11709. NodeManager should be shut down or blacklisted wh…

…en it ca…" (apache#7028) This reverts commit f000942.
KeeProMise · Sep 7, 2024 · 8c41fbc · 8c41fbc
1 parent a00b1c0
commit 8c41fbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 36 deletions.
diff --git a/...nager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java b/...nager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java
@@ -451,10 +451,8 @@ public void startLocalizer(LocalizerStartContext ctx)
 
     } catch (PrivilegedOperationException e) {
       int exitCode = e.getExitCode();
-      LOG.error("Unrecoverable issue occurred. Marking the node as unhealthy to prevent "
-          + "further containers to get scheduled on the node and cause application failures. " +
-          "Exit code from the container " + locId + "startLocalizer is : " + exitCode, e);
-      nmContext.getNodeStatusUpdater().reportException(e);
+      LOG.warn("Exit code from container {} startLocalizer is : {}",
+          locId, exitCode, e);
 
       throw new IOException("Application " + appId + " initialization failed" +
           " (exitCode=" + exitCode + ") with output: " + e.getOutput(), e);

diff --git a/...t/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java b/...t/java/org/apache/hadoop/yarn/server/nodemanager/TestLinuxContainerExecutorWithMocks.java
@@ -26,7 +26,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -38,7 +37,6 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.LineNumberReader;
-import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -347,8 +345,7 @@ public void testStartLocalizer() throws IOException {
 
   @Test
   public void testContainerLaunchError()
-      throws IOException, ContainerExecutionException, URISyntaxException, IllegalAccessException,
-      NoSuchFieldException {
+      throws IOException, ContainerExecutionException, URISyntaxException {
 
     final String[] expecetedMessage = {"badcommand", "Exit code: 24"};
     final String[] executor = {
@@ -390,14 +387,6 @@ public Object answer(InvocationOnMock invocationOnMock)
       dirsHandler.init(conf);
       mockExec.setConf(conf);
 
-      //set the private nmContext field without initing the LinuxContainerExecutor
-      NodeManager nodeManager = new NodeManager();
-      NodeManager.NMContext nmContext =
-          nodeManager.createNMContext(null, null, null, false, conf);
-      Field lceNmContext = LinuxContainerExecutor.class.getDeclaredField("nmContext");
-      lceNmContext.setAccessible(true);
-      lceNmContext.set(mockExec, nmContext);
-
       String appSubmitter = "nobody";
       String cmd = String
           .valueOf(PrivilegedOperation.RunAsUserCommand.LAUNCH_CONTAINER.
@@ -612,30 +601,15 @@ public void testNoExitCodeFromPrivilegedOperation() throws Exception {
     LinuxContainerRuntime runtime = new DefaultLinuxContainerRuntime(
         spyPrivilegedExecutor);
     runtime.initialize(conf, null);
+    mockExec = new LinuxContainerExecutor(runtime);
+    mockExec.setConf(conf);
     LinuxContainerExecutor lce = new LinuxContainerExecutor(runtime) {
       @Override
       protected PrivilegedOperationExecutor getPrivilegedOperationExecutor() {
         return spyPrivilegedExecutor;
       }
     };
     lce.setConf(conf);
-
-    //set the private nmContext field without initing the LinuxContainerExecutor
-    NodeManager nodeManager = new NodeManager();
-    NodeManager.NMContext nmContext =
-        nodeManager.createNMContext(null, null, null, false, conf);
-    NodeManager.NMContext spyNmContext = spy(nmContext);
-
-    //initialize a mock NodeStatusUpdater
-    NodeStatusUpdaterImpl nodeStatusUpdater = mock(NodeStatusUpdaterImpl.class);
-    nmContext.setNodeStatusUpdater(nodeStatusUpdater);
-    //imitate a void method call on the NodeStatusUpdater when setting NM unhealthy.
-    doNothing().when(nodeStatusUpdater).reportException(any());
-
-    Field lceNmContext = LinuxContainerExecutor.class.getDeclaredField("nmContext");
-    lceNmContext.setAccessible(true);
-    lceNmContext.set(lce, nmContext);
-
     InetSocketAddress address = InetSocketAddress.createUnresolved(
         "localhost", 8040);
     Path nmPrivateCTokensPath= new Path("file:///bin/nmPrivateCTokensPath");
@@ -698,9 +672,6 @@ protected PrivilegedOperationExecutor getPrivilegedOperationExecutor() {
       assertTrue("Unexpected exception " + e,
           e.getMessage().contains("exit code"));
     }
-
-    //verify that the NM was set unhealthy on PrivilegedOperationException
-    verify(nodeStatusUpdater, times(1)).reportException(any());
   }
 
   @Test