You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pu...@apache.org on 2015/08/12 08:29:29 UTC
oozie git commit: OOZIE-2325 Shell action fails if user overrides
oozie.launcher.mapreduce.map.env
Repository: oozie
Updated Branches:
refs/heads/master a6d640d58 -> f1f3c64dd
OOZIE-2325 Shell action fails if user overrides oozie.launcher.mapreduce.map.env
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f1f3c64d
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f1f3c64d
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f1f3c64d
Branch: refs/heads/master
Commit: f1f3c64dd59bfbe4aa52a8df79d6b44d06450a9f
Parents: a6d640d
Author: Purshotam Shah <pu...@yahoo-inc.com>
Authored: Tue Aug 11 23:30:02 2015 -0700
Committer: Purshotam Shah <pu...@yahoo-inc.com>
Committed: Tue Aug 11 23:30:02 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/action/hadoop/ShellActionExecutor.java | 2 ++
release-log.txt | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/f1f3c64d/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
index 3be1eaa..b1947e4 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java
@@ -33,6 +33,7 @@ public class ShellActionExecutor extends JavaActionExecutor {
* Config property name to set the child environment
*/
public String OOZIE_LAUNCHER_CHILD_ENV = "mapred.child.env";
+ public String OOZIE_LAUNCHER_MAP_ENV = "mapreduce.map.env";
public ShellActionExecutor() {
super("shell");
@@ -129,6 +130,7 @@ public class ShellActionExecutor extends JavaActionExecutor {
*/
protected void addDefaultChildEnv(Configuration conf) {
String envValues = "PATH=.:$PATH";
+ updateProperty(conf, OOZIE_LAUNCHER_MAP_ENV, envValues);
updateProperty(conf, OOZIE_LAUNCHER_CHILD_ENV, envValues);
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/f1f3c64d/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 39aa295..1f50731 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2325 Shell action fails if user overrides oozie.launcher.mapreduce.map.env (kailongs via puru)
OOZIE-2324 A syntax error in the kill node causes the workflow to get stuck and other problems (rkanter)
OOZIE-2309 Enable the coord:dateOffset() function in /coordinator-app/datasets/dataset/@initial-instance (kailongs via rohini)
OOZIE-2305 Compile Oozie with Hive-1.2.0 (raviprak via shwethags)