Repository: oozie Updated Branches: refs/heads/master 3fd77d2ca -> 4b130213b
OOZIE-1720 Oozie Hive action doesn't honour mapred.job.name (mithun via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4b130213 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4b130213 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4b130213 Branch: refs/heads/master Commit: 4b130213bac3a6368bb5b0e71f9ddbc74bc4cc33 Parents: 3fd77d2 Author: Rohini Palaniswamy <[email protected]> Authored: Mon Mar 17 12:57:35 2014 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Mon Mar 17 12:57:35 2014 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/java/org/apache/oozie/action/hadoop/HiveMain.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/4b130213/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0af5e3c..1c4ded0 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1720 Oozie Hive action doesn't honour mapred.job.name (mithun via rohini) OOZIE-1543 Minor typo in Hive Action documentation (anbu78 via rkanter) OOZIE-1650 Whitelisting docs are incorrect (anbu78 via rkanter) OOZIE-1733 Fix test failures caused by OOZIE-1722 (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/4b130213/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 348c606..0a8aaaf 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 @@ -96,7 +96,10 @@ public class HiveMain extends LauncherMain { } // Have to explicitly unset this property or Hive will not set it. - hiveConf.set("mapred.job.name", ""); + // Reset if Oozie-defaults are set. Otherwise, honour user-selected job-name. + if (hiveConf.get("mapred.job.name", "").startsWith("oozie:action:")) { + hiveConf.set("mapred.job.name", ""); + } // See https://issues.apache.org/jira/browse/HIVE-1411 hiveConf.set("datanucleus.plugin.pluginRegistryBundleCheck", "LOG");
