mirror of
https://git.freebsd.org/ports.git
synced 2025-07-17 09:19:15 -04:00
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
898 B
Java
11 lines
898 B
Java
--- ./hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java.orig 2015-01-06 01:28:53.000000000 +0300
|
|
+++ ./hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java 2015-01-06 01:29:32.000000000 +0300
|
|
@@ -277,7 +277,7 @@ public class DefaultContainerExecutor ex
|
|
pout.println();
|
|
pout.println("echo $$ > " + pidFile.toString() + ".tmp");
|
|
pout.println("/bin/mv -f " + pidFile.toString() + ".tmp " + pidFile);
|
|
- String exec = Shell.isSetsidAvailable? "exec setsid" : "exec";
|
|
+ String exec = Shell.isSetsidAvailable? "exec ssid" : "exec";
|
|
pout.println(exec + " /bin/bash \"" +
|
|
launchDst.toUri().getPath().toString() + "\"");
|
|
}
|