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-2@1376634 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-08-23 18:25:10 +00:00
parent bc5f02bac0
commit 6b62c018e3
2 changed files with 4 additions and 2 deletions

View File

@ -22,6 +22,9 @@ Branch-2 ( Unreleased changes )
YARN-13. Fix pom versions for YARN in branch-2 (todd) YARN-13. Fix pom versions for YARN in branch-2 (todd)
MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. (Andy Isaacson
via atm)
Release 2.1.0-alpha - Unreleased Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -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");