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/09/25 17:01:51 UTC
oozie git commit: OOZIE-2885 Running Spark actions should not need
Hive on the classpath (satishsaley)
Repository: oozie
Updated Branches:
refs/heads/master ceefa2f6e -> 0034f7f47
OOZIE-2885 Running Spark actions should not need Hive on the classpath (satishsaley)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/0034f7f4
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0034f7f4
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0034f7f4
Branch: refs/heads/master
Commit: 0034f7f471dd5bc9a61aac0ae957c50976f552c8
Parents: ceefa2f
Author: satishsaley <sa...@apache.org>
Authored: Mon Sep 25 09:49:40 2017 -0700
Committer: satishsaley <sa...@apache.org>
Committed: Mon Sep 25 09:49:40 2017 -0700
----------------------------------------------------------------------
release-log.txt | 1 +
.../main/java/org/apache/oozie/action/hadoop/SparkMain.java | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/0034f7f4/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 646bf81..7b393ba 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.0.0 release (trunk - unreleased)
+OOZIE-2885 Running Spark actions should not need Hive on the classpath (satishsaley)
OOZIE-2909 amend Fix license headers (andras.piros via gezapeti)
OOZIE-3054 Disable erasure coding for sharelib if Oozie runs on Hadoop 3 (pbacsko)
OOZIE-3048 Check El Functions for the coordinator action (satishsaley)
http://git-wip-us.apache.org/repos/asf/oozie/blob/0034f7f4/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 47172be..d12df18 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
@@ -253,11 +253,6 @@ public class SparkMain extends LauncherMain {
hiveConf.unset("hive.exec.local.scratchdir");
// Write the action configuration out to hive-site.xml
- URL hiveSiteURL = createFileWithContentIfNotExists(HIVE_SITE_CONF, hiveConf);
- // Reset the hiveSiteURL static variable as we just created
- // hive-site.xml.
- // If prepare block had a drop partition it would have been initialized
- // to null.
- HiveConf.setHiveSiteLocation(hiveSiteURL);
+ createFileWithContentIfNotExists(HIVE_SITE_CONF, hiveConf);
}
}