Repository: oozie Updated Branches: refs/heads/master 8ebbc4bdf -> 23831e855
OOZIE-2377 Hive2 Action should not propagate oozie.hive2.* properties to Beeline (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/23831e85 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/23831e85 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/23831e85 Branch: refs/heads/master Commit: 23831e855aef98f7e97791d00adaf984b1b5311b Parents: 8ebbc4b Author: Robert Kanter <[email protected]> Authored: Wed Sep 30 14:23:04 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Wed Sep 30 14:23:04 2015 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/23831e85/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index d2eee57..1ccd433 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2377 Hive2 Action should not propagate oozie.hive2.* properties to Beeline (rkanter) OOZIE-2376 Default action configs not honored if no <configuration> section in workflow (rkanter) OOZIE-2365 oozie fail to start when smtp password not set (rohini) OOZIE-2360 Spark Action fails due to missing mesos jar (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/23831e85/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java ---------------------------------------------------------------------- diff --git a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java index 56f5451..e122608 100644 --- a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java +++ b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java @@ -216,8 +216,8 @@ public class Hive2Main extends LauncherMain { arguments.add("--hiveconf"); arguments.add("mapreduce.job.tags=" + actionConf.get(LauncherMain.MAPREDUCE_JOB_TAGS)); } - // Propagate "oozie.*" configs - for (Map.Entry<String, String> oozieConfig : actionConf.getValByRegex("^oozie\\.(?!launcher).+").entrySet()) { + // Propagate "oozie.*" configs (but not "oozie.launcher.*" nor "oozie.hive2.*") + for (Map.Entry<String, String> oozieConfig : actionConf.getValByRegex("^oozie\\.(?!launcher|hive2).+").entrySet()) { arguments.add("--hiveconf"); arguments.add(oozieConfig.getKey() + "=" + oozieConfig.getValue()); }
