瀏覽代碼

svn merge -c 1376632 FIXES: MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. Contributed by Andy Isaacson.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1376660 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans 12 年之前
父節點
當前提交
1192f261b4

+ 4 - 0
hadoop-yarn-project/CHANGES.txt

@@ -51,3 +51,7 @@ Release 0.23.3 - Unreleased
     refreshing of queues (Arun Murthy via tgraves)
     refreshing of queues (Arun Murthy via tgraves)
 
 
     MAPREDUCE-4323. NM leaks filesystems (Jason Lowe via jeagles)
     MAPREDUCE-4323. NM leaks filesystems (Jason Lowe via jeagles)
+
+    MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. (Andy Isaacson
+    via atm)
+

+ 1 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java

@@ -169,7 +169,7 @@ public class DefaultContainerExecutor extends ContainerExecutor {
           ContainerExecutor.TASK_LAUNCH_SCRIPT_PERMISSION);
           ContainerExecutor.TASK_LAUNCH_SCRIPT_PERMISSION);
 
 
       // Setup command to run
       // Setup command to run
-      String[] command = {"bash", "-c",
+      String[] command = {"bash",
           wrapperScriptDst.toUri().getPath().toString()};
           wrapperScriptDst.toUri().getPath().toString()};
       LOG.info("launchContainer: " + Arrays.toString(command));
       LOG.info("launchContainer: " + Arrays.toString(command));
       shExec = new ShellCommandExecutor(
       shExec = new ShellCommandExecutor(
@@ -211,7 +211,6 @@ public class DefaultContainerExecutor extends ContainerExecutor {
     sb.append("/bin/mv -f " + pidFilePath + ".tmp " + pidFilePath + "\n");
     sb.append("/bin/mv -f " + pidFilePath + ".tmp " + pidFilePath + "\n");
     sb.append(ContainerExecutor.isSetsidAvailable? "exec setsid" : "exec");
     sb.append(ContainerExecutor.isSetsidAvailable? "exec setsid" : "exec");
     sb.append(" /bin/bash ");
     sb.append(" /bin/bash ");
-    sb.append("-c ");
     sb.append("\"");
     sb.append("\"");
     sb.append(launchScriptDst);
     sb.append(launchScriptDst);
     sb.append("\"\n");
     sb.append("\"\n");