You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by sa...@apache.org on 2017/02/07 06:00:48 UTC
oozie git commit: OOZIE-2790 log4j configuration is not passed to
spark executors (satishsaley)
Repository: oozie
Updated Branches:
refs/heads/master b1bfa109b -> 4478d53b9
OOZIE-2790 log4j configuration is not passed to spark executors (satishsaley)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4478d53b
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4478d53b
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4478d53b
Branch: refs/heads/master
Commit: 4478d53b929bfe20e0946446886d8eb1673139c2
Parents: b1bfa10
Author: Satish Subhashrao Saley <sa...@yahoo-inc.com>
Authored: Mon Feb 6 21:58:36 2017 -0800
Committer: Satish Subhashrao Saley <sa...@yahoo-inc.com>
Committed: Mon Feb 6 21:58:36 2017 -0800
----------------------------------------------------------------------
release-log.txt | 1 +
.../src/main/java/org/apache/oozie/action/hadoop/SparkMain.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/4478d53b/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 16beee2..f693f70 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2790 log4j configuration is not passed to spark executors (satishsaley)
OOZIE-2787 Oozie distributes application jar twice making the spark job fail (satishsaley)
OOZIE-2789 Maven complains about checkstyle error during build (xzheng via abhishekbafna)
OOZIE-2777 Config-default.xml longer than 64k results in java.io.UTFDataFormatException (gezapeti via harsh)
http://git-wip-us.apache.org/repos/asf/oozie/blob/4478d53b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
index 8f2f438..911c99d 100644
--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
+++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java
@@ -218,6 +218,7 @@ public class SparkMain extends LauncherMain {
JarFilter jarfilter = new JarFilter(fixedUris, jarPath);
jarfilter.filter();
jarPath = jarfilter.getApplicationJar();
+ fixedUris.add(new Path(SPARK_LOG4J_PROPS).toUri());
String cachedFiles = StringUtils.join(fixedUris, ",");
if (cachedFiles != null && !cachedFiles.isEmpty()) {
sparkArgs.add("--files");