You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2014/10/29 20:13:08 UTC
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.
Repository: hadoop
Updated Branches:
refs/heads/trunk 5c900b522 -> a8c120222
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.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8c12022
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8c12022
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8c12022
Branch: refs/heads/trunk
Commit: a8c120222047280234c3411ce1c1c9b17f08c851
Parents: 5c900b5
Author: Zhijie Shen <zj...@apache.org>
Authored: Wed Oct 29 12:05:14 2014 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Wed Oct 29 12:12:30 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/a8c12022/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 50b806f..2369d50 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -795,6 +795,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/a8c12022/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(