Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java (revision 1540899) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java (working copy) @@ -375,13 +375,19 @@ LOG.debug("Sending signal to pid " + processId + " as user " + user + " for container " + containerIdStr); + + final Signal signal = sleepDelayBeforeSigKill > 0 + ? Signal.TERM + : Signal.KILL; + + boolean result = exec.signalContainer(user, processId, signal); + + LOG.debug("Sent signal " + signal + " to pid " + processId + + " as user " + user + + " for container " + containerIdStr + + ", result=" + (result? "success" : "failed")); + if (sleepDelayBeforeSigKill > 0) { - boolean result = exec.signalContainer(user, - processId, Signal.TERM); - LOG.debug("Sent signal to pid " + processId - + " as user " + user - + " for container " + containerIdStr - + ", result=" + (result? "success" : "failed")); new DelayedProcessKiller(container, user, processId, sleepDelayBeforeSigKill, Signal.KILL, exec).start(); } Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java (revision 1540899) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java (working copy) @@ -97,7 +97,6 @@ conf.setClass( YarnConfiguration.NM_CONTAINER_MON_RESOURCE_CALCULATOR, LinuxResourceCalculatorPlugin.class, ResourceCalculatorPlugin.class); - conf.setLong(YarnConfiguration.NM_SLEEP_DELAY_BEFORE_SIGKILL_MS, 1000); super.setup(); } @@ -590,8 +589,9 @@ AuxiliaryServiceHelper.getServiceDataFromEnv(serviceName, env)); } - @Test - public void testDelayedKill() throws Exception { + private void internalKillTest(boolean delayed) throws Exception { + conf.setLong(YarnConfiguration.NM_SLEEP_DELAY_BEFORE_SIGKILL_MS, + delayed ? 1000 : 0); containerManager.start(); // ////// Construct the Container-id @@ -675,7 +675,8 @@ BaseContainerManagerTest.waitForContainerState(containerManager, cId, ContainerState.COMPLETE); - // container stop sends a sigterm followed by a sigkill + // if delayed container stop sends a sigterm followed by a sigkill + // otherwise sigkill is sent immediately GetContainerStatusesRequest gcsRequest = GetContainerStatusesRequest.newInstance(containerIds); @@ -690,7 +691,7 @@ // Windows, because the process is not notified when killed by winutils. // There is no way for the process to trap and respond. Instead, we can // verify that the job object with ID matching container ID no longer exists. - if (Shell.WINDOWS) { + if (Shell.WINDOWS || !delayed) { Assert.assertFalse("Process is still alive!", DefaultContainerExecutor.containerIsAlive(cId.toString())); } else { @@ -713,6 +714,16 @@ } } + @Test + public void testDelayedKill() throws Exception { + internalKillTest(true); + } + + @Test + public void testImmediateKill() throws Exception { + internalKillTest(false); + } + @SuppressWarnings("rawtypes") @Test public void testCallFailureWithNullLocalizedResources() {