Repository: oozie Updated Branches: refs/heads/master 58bc84a3e -> c2fe52b83
OOZIE-2380 Oozie Hive action failed with wrong tmp path (vaifer via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c2fe52b8 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c2fe52b8 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c2fe52b8 Branch: refs/heads/master Commit: c2fe52b8327d6c0c2fcc2d1b74169efe21b90950 Parents: 58bc84a Author: Robert Kanter <[email protected]> Authored: Tue Dec 22 11:25:08 2015 -0800 Committer: Robert Kanter <[email protected]> Committed: Tue Dec 22 11:25:08 2015 -0800 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/java/org/apache/oozie/action/hadoop/HiveMain.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c2fe52b8/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 69d8697..275db88 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2380 Oozie Hive action failed with wrong tmp path (vaifer via rkanter) OOZIE-2222 Oozie UI parent job should be clickable (puru) OOZIE-2407 AbandonedService should not send mail if there is no abandoned coord (puru) OOZIE-2402 oozie-setup.sh sharelib create takes a long time on large clusters (yalovyyi via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/c2fe52b8/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java index 58c28d3..94e586b 100644 --- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java +++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java @@ -69,7 +69,7 @@ public class HiveMain extends LauncherMain { run(HiveMain.class, args); } - private static Configuration initActionConf() { + private static Configuration initActionConf() throws java.io.IOException { // Loading action conf prepared by Oozie Configuration hiveConf = new Configuration(false); @@ -117,7 +117,9 @@ public class HiveMain extends LauncherMain { // to force hive to use the jobclient to submit the job, never using HADOOPBIN (to do localmode) hiveConf.setBoolean("hive.exec.mode.local.auto", false); - hiveConf.set("hive.querylog.location", "./hivelogs"); + String pwd = new java.io.File("").getCanonicalPath(); + hiveConf.set("hive.querylog.location", pwd + File.separator + "hivetmp" + File.separator + "querylog"); + hiveConf.set("hive.exec.local.scratchdir", pwd + File.separator + "hivetmp" + File.separator + "scratchdir"); return hiveConf; }
