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.
11 lines
645 B
Java
11 lines
645 B
Java
--- ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java.orig 2015-01-06 01:14:31.000000000 +0300
|
|
+++ ./hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskLog.java 2015-01-06 01:14:47.000000000 +0300
|
|
@@ -538,7 +538,7 @@ public class TaskLog {
|
|
mergedCmd.append("(");
|
|
} else if(ProcessTree.isSetsidAvailable && useSetsid &&
|
|
!Shell.WINDOWS) {
|
|
- mergedCmd.append("exec setsid ");
|
|
+ mergedCmd.append("exec ssid ");
|
|
} else {
|
|
mergedCmd.append("exec ");
|
|
}
|