You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2015/06/04 22:22:12 UTC
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)
Repository: tez
Updated Branches:
refs/heads/master c241f4094 -> 588a14f04
TEZ-2537. mapreduce.map.env and mapreduce.reduce.env need to fall back to mapred.child.env for compatibility (Rohini Palaniswamy via jeagles)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/588a14f0
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/588a14f0
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/588a14f0
Branch: refs/heads/master
Commit: 588a14f04a7f39bffc178fe75cdf5e621c46a5b6
Parents: c241f40
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Thu Jun 4 15:21:47 2015 -0500
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Thu Jun 4 15:21:47 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/588a14f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 91fb528..876cb5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -424,6 +424,7 @@ TEZ-UI CHANGES (TEZ-8):
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/588a14f0/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 ed021fb..76d3849 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
@@ -383,8 +383,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.