Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-4436. DistShell ApplicationMaster.ExecBatScripStringtPath is misspelled (mattlamantia via rkanter) 

(cherry picked from commit 8286270466)
This commit is contained in:
Robert Kanter 2016-03-29 17:21:29 -07:00
parent 9df2e54160
commit b7e6d5cbfe
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
View File

@ -259,8 +259,9 @@ public class ApplicationMaster {
private String domainId = null; private String domainId = null;
// Hardcoded path to shell script in launch container's local env // Hardcoded path to shell script in launch container's local env
private static final String ExecShellStringPath = Client.SCRIPT_PATH + ".sh"; private static final String EXEC_SHELL_STRING_PATH = Client.SCRIPT_PATH
private static final String ExecBatScripStringtPath = Client.SCRIPT_PATH + ".sh";
private static final String EXEC_BAT_SCRIPT_STRING_PATH = Client.SCRIPT_PATH
+ ".bat"; + ".bat";
// Hardcoded path to custom log_properties // Hardcoded path to custom log_properties
@ -1025,8 +1026,8 @@ public class ApplicationMaster {
LocalResource shellRsrc = LocalResource.newInstance(yarnUrl, LocalResource shellRsrc = LocalResource.newInstance(yarnUrl,
LocalResourceType.FILE, LocalResourceVisibility.APPLICATION, LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
shellScriptPathLen, shellScriptPathTimestamp); shellScriptPathLen, shellScriptPathTimestamp);
localResources.put(Shell.WINDOWS ? ExecBatScripStringtPath : localResources.put(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH :
ExecShellStringPath, shellRsrc); EXEC_SHELL_STRING_PATH, shellRsrc);
shellCommand = Shell.WINDOWS ? windows_command : linux_bash_command; shellCommand = Shell.WINDOWS ? windows_command : linux_bash_command;
} }
@ -1037,8 +1038,8 @@ public class ApplicationMaster {
vargs.add(shellCommand); vargs.add(shellCommand);
// Set shell script path // Set shell script path
if (!scriptPath.isEmpty()) { if (!scriptPath.isEmpty()) {
vargs.add(Shell.WINDOWS ? ExecBatScripStringtPath vargs.add(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH
: ExecShellStringPath); : EXEC_SHELL_STRING_PATH);
} }
// Set args for the shell command if any // Set args for the shell command if any