75983a5bd0
subprocess (common case if task process is a shell script) and job is being killed with mapred job -kill <...>, then subprocess will not die and remain running orphaned.
20 lines
1.1 KiB
Java
20 lines
1.1 KiB
Java
--- ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcessTree.java.orig 2015-01-06 01:16:49.000000000 +0300
|
|
+++ ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcessTree.java 2015-01-06 01:17:24.000000000 +0300
|
|
@@ -54,14 +54,14 @@ public class ProcessTree {
|
|
ShellCommandExecutor shexec = null;
|
|
boolean setsidSupported = true;
|
|
try {
|
|
- String[] args = {"setsid", "bash", "-c", "echo $$"};
|
|
+ String[] args = {"ssid", "bash", "-c", "echo $$"};
|
|
shexec = new ShellCommandExecutor(args);
|
|
shexec.execute();
|
|
} catch (IOException ioe) {
|
|
- LOG.warn("setsid is not available on this machine. So not using it.");
|
|
+ LOG.warn("ssid is not available on this machine. So not using it.");
|
|
setsidSupported = false;
|
|
} finally { // handle the exit code
|
|
- LOG.info("setsid exited with exit code " + shexec.getExitCode());
|
|
+ LOG.info("ssid exited with exit code " + shexec.getExitCode());
|
|
}
|
|
return setsidSupported;
|
|
}
|