diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c index 102111b..1cd2f31 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c @@ -1524,21 +1524,13 @@ int signal_container_as_user(const char *user, int pid, int sig) { } //Don't continue if the process-group is not alive anymore. - int has_group = 1; if (kill(-pid,0) < 0) { - if (kill(pid, 0) < 0) { - if (errno == ESRCH) { - return INVALID_CONTAINER_PID; - } - fprintf(LOGFILE, "Error signalling container %d with %d - %s\n", - pid, sig, strerror(errno)); - return -1; - } else { - has_group = 0; - } + fprintf(LOGFILE, "Error signalling not exist process group %d " + "with signal %d\n", pid, sig); + return INVALID_CONTAINER_PID; } - if (kill((has_group ? -1 : 1) * pid, sig) < 0) { + if (kill(-pid, sig) < 0) { if(errno != ESRCH) { fprintf(LOGFILE, "Error signalling process group %d with signal %d - %s\n", @@ -1552,8 +1544,7 @@ int signal_container_as_user(const char *user, int pid, int sig) { return INVALID_CONTAINER_PID; } } - fprintf(LOGFILE, "Killing process %s%d with %d\n", - (has_group ? "group " :""), pid, sig); + fprintf(LOGFILE, "Killing process group %d with %d\n", pid, sig); return 0; }