tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject tez git commit: TEZ-2537. mapreduce.map.env and mapreduce.reduce.env need to fall back to mapred.child.env for compatibility (Rohini Palaniswamy via jeagles)
Date Thu, 04 Jun 2015 20:26:43 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 222b241f2 -> 66ee8e8f5


TEZ-2537. mapreduce.map.env and mapreduce.reduce.env need to fall back to mapred.child.env
for compatibility (Rohini Palaniswamy via jeagles)

(cherry picked from commit 588a14f04a7f39bffc178fe75cdf5e621c46a5b6)


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

Branch: refs/heads/branch-0.5
Commit: 66ee8e8f5098b2f304d8df23032dd6212eb6a1ab
Parents: 222b241
Author: Jonathan Eagles <jeagles@yahoo-inc.com>
Authored: Thu Jun 4 15:21:47 2015 -0500
Committer: Jonathan Eagles <jeagles@yahoo-inc.com>
Committed: Thu Jun 4 15:25:48 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/66ee8e8f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 98e426b..c9da0b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2537. mapreduce.map.env and mapreduce.reduce.env need to fall back to mapred.child.env
for compatibility
   TEZ-2304. InvalidStateTransitonException TA_SCHEDULE at START_WAIT during recovery
   TEZ-2488. Tez AM crashes if a submitted DAG is configured to use invalid resource sizes.
   TEZ-2080. Localclient should be using tezconf in init instead of yarnconf.

http://git-wip-us.apache.org/repos/asf/tez/blob/66ee8e8f/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
index cea05e7..313c941 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java
@@ -365,8 +365,8 @@ public class MRHelpers {
 
     // Add the env variables passed by the user
     String mapredChildEnv = (isMap ?
-        conf.get(MRJobConfig.MAP_ENV, "")
-        : conf.get(MRJobConfig.REDUCE_ENV, ""));
+        conf.get(MRJobConfig.MAP_ENV, conf.get("mapred.child.env"))
+        : conf.get(MRJobConfig.REDUCE_ENV, conf.get("mapred.child.env")));
     TezYARNUtils.appendToEnvFromInputString(environment, mapredChildEnv, File.pathSeparator);
 
     // Set logging level in the environment.


Mime
View raw message