hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjs...@apache.org
Subject git commit: YARN-2769. Fixed the problem that timeline domain is not set in distributed shell AM when using shell_command on Windows. Contributed by Varun Vasudev.
Date Wed, 29 Oct 2014 19:15:07 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f6102831b -> d2a5c386c


YARN-2769. Fixed the problem that timeline domain is not set in distributed shell AM when
using shell_command on Windows. Contributed by Varun Vasudev.

(cherry picked from commit 72496311def320987c31822776e8fbb73dfcc726)


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

Branch: refs/heads/branch-2
Commit: d2a5c386c1693be09e9025da4a879ba2ffd83152
Parents: f610283
Author: Zhijie Shen <zjshen@apache.org>
Authored: Wed Oct 29 12:05:14 2014 -0700
Committer: Zhijie Shen <zjshen@apache.org>
Committed: Wed Oct 29 12:14:48 2014 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                               | 3 +++
 .../yarn/applications/distributedshell/ApplicationMaster.java | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2a5c386/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a2bfa1d..dc81957 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -765,6 +765,9 @@ Release 2.6.0 - UNRELEASED
     YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is
     enabled. (Xuan Gong via zjshen)
 
+    YARN-2769. Fixed the problem that timeline domain is not set in distributed shell
+    AM when using shell_command on Windows. (Varun Vasudev via zjshen)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2a5c386/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 e6ded00..7906e6f 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
@@ -470,9 +470,6 @@ public class ApplicationMaster {
         shellScriptPathLen = Long.valueOf(envs
             .get(DSConstants.DISTRIBUTEDSHELLSCRIPTLEN));
       }
-      if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN)) {
-        domainId = envs.get(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN);
-      }
       if (!scriptPath.isEmpty()
           && (shellScriptPathTimestamp <= 0 || shellScriptPathLen <= 0)) {
         LOG.error("Illegal values in env for shell script path" + ", path="
@@ -483,6 +480,10 @@ public class ApplicationMaster {
       }
     }
 
+    if (envs.containsKey(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN)) {
+      domainId = envs.get(DSConstants.DISTRIBUTEDSHELLTIMELINEDOMAIN);
+    }
+
     containerMemory = Integer.parseInt(cliParser.getOptionValue(
         "container_memory", "10"));
     containerVirtualCores = Integer.parseInt(cliParser.getOptionValue(


Mime
View raw message