You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2016/10/10 11:52:33 UTC
[34/50] [abbrv] oozie git commit: OOZIE-2596 Pyspark temporary fix
OOZIE-2596 Pyspark temporary fix
Change-Id: I25f3619a4b1df73a73e6833a45c27e79dfa3751e
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b584481a
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b584481a
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b584481a
Branch: refs/heads/oya
Commit: b584481a70e80379d80806ac06b9e244e78d3149
Parents: 11a8429
Author: Peter Cseh <ge...@cloudera.com>
Authored: Mon Sep 26 15:21:47 2016 +0200
Committer: Peter Cseh <ge...@cloudera.com>
Committed: Mon Sep 26 15:25:51 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/oozie/action/hadoop/JavaActionExecutor.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/b584481a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index 8b5f2b0..dbe7bc1 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -1173,6 +1173,9 @@ public class JavaActionExecutor extends ActionExecutor {
// FIXME: move this to specific places where it's actually needed - keeping it here for now
ClasspathUtils.addMapReduceToClasspath(env, launcherJobConf);
+ // FIXME: Pyspark fix
+ // FIXME: Do we want to support mapred.child.env?
+ env.put("SPARK_HOME", ".");
amContainer.setEnvironment(env);