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(); }