hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rkan...@apache.org
Subject hadoop git commit: YARN-4436. DistShell ApplicationMaster.ExecBatScripStringtPath is misspelled (mattlamantia via rkanter)
Date Wed, 30 Mar 2016 00:21:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk e3d15a2e2 -> 828627046


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/82862704
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/82862704
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/82862704

Branch: refs/heads/trunk
Commit: 82862704665aa0bad51118b1b48c7230b194c01c
Parents: e3d15a2
Author: Robert Kanter <rkanter@apache.org>
Authored: Tue Mar 29 17:21:29 2016 -0700
Committer: Robert Kanter <rkanter@apache.org>
Committed: Tue Mar 29 17:21:29 2016 -0700

----------------------------------------------------------------------
 .../distributedshell/ApplicationMaster.java            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/82862704/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
index 0f82903..cbe0348 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
@@ -259,8 +259,9 @@ public class ApplicationMaster {
   private String domainId = null;
 
   // Hardcoded path to shell script in launch container's local env
-  private static final String ExecShellStringPath = Client.SCRIPT_PATH + ".sh";
-  private static final String ExecBatScripStringtPath = Client.SCRIPT_PATH
+  private static final String EXEC_SHELL_STRING_PATH = Client.SCRIPT_PATH
+      + ".sh";
+  private static final String EXEC_BAT_SCRIPT_STRING_PATH = Client.SCRIPT_PATH
       + ".bat";
 
   // Hardcoded path to custom log_properties
@@ -1025,8 +1026,8 @@ public class ApplicationMaster {
         LocalResource shellRsrc = LocalResource.newInstance(yarnUrl,
           LocalResourceType.FILE, LocalResourceVisibility.APPLICATION,
           shellScriptPathLen, shellScriptPathTimestamp);
-        localResources.put(Shell.WINDOWS ? ExecBatScripStringtPath :
-            ExecShellStringPath, shellRsrc);
+        localResources.put(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH :
+            EXEC_SHELL_STRING_PATH, shellRsrc);
         shellCommand = Shell.WINDOWS ? windows_command : linux_bash_command;
       }
 
@@ -1037,8 +1038,8 @@ public class ApplicationMaster {
       vargs.add(shellCommand);
       // Set shell script path
       if (!scriptPath.isEmpty()) {
-        vargs.add(Shell.WINDOWS ? ExecBatScripStringtPath
-            : ExecShellStringPath);
+        vargs.add(Shell.WINDOWS ? EXEC_BAT_SCRIPT_STRING_PATH
+            : EXEC_SHELL_STRING_PATH);
       }
 
       // Set args for the shell command if any


Mime
View raw message