OOZIE-2790 log4j configuration is not passed to spark executors (satishsaley)
(cherry picked from commit 4478d53b929bfe20e0946446886d8eb1673139c2) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/73508586 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/73508586 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/73508586 Branch: refs/heads/branch-4.3 Commit: 73508586293259550eef2b43a1abf8240f0be58d Parents: 38e6478 Author: Satish Subhashrao Saley <sa...@yahoo-inc.com> Authored: Mon Feb 6 21:58:36 2017 -0800 Committer: satishsaley <satishsa...@apache.org> Committed: Fri Dec 8 16:34:55 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/73508586/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 9e74443..c39b3ba 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.1 release +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-2777 Config-default.xml longer than 64k results in java.io.UTFDataFormatException (gezapeti via harsh) OOZIE-2771 Allow retrieving keystore and truststore passwords from Hadoop Credential Provider (asasvari via abhishekbafna) http://git-wip-us.apache.org/repos/asf/oozie/blob/73508586/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");
