You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2016/09/19 17:20:39 UTC
oozie git commit: OOZIE-2498 Oozie CallerId configuration for
downstream components (abhishekbafna via rohini)
Repository: oozie
Updated Branches:
refs/heads/master 3bd45e924 -> 3ad35372e
OOZIE-2498 Oozie CallerId configuration for downstream components (abhishekbafna via rohini)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3ad35372
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3ad35372
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3ad35372
Branch: refs/heads/master
Commit: 3ad35372e20d9e995688d52548f7858537f22be3
Parents: 3bd45e9
Author: Rohini Palaniswamy <ro...@apache.org>
Authored: Mon Sep 19 10:20:44 2016 -0700
Committer: Rohini Palaniswamy <ro...@apache.org>
Committed: Mon Sep 19 10:20:44 2016 -0700
----------------------------------------------------------------------
release-log.txt | 1 +
.../src/main/java/org/apache/oozie/action/hadoop/HiveMain.java | 5 +++++
.../src/main/java/org/apache/oozie/action/hadoop/PigMain.java | 4 ++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/3ad35372/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index a8afcf4..515521c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2498 Oozie CallerId configuration for downstream components (abhishekbafna via rohini)
OOZIE-2491 oozie acl cannot specify group,it does`t work (abhishekbafna via rohini)
OOZIE-2569 Adding yarn-site, core-site, hdfs-site and mapred-site into spark launcher (abhishekbafna via rohini)
OOZIE-2675 Drop support for hadoop 0.23 (abhishekbafna via rohini)
http://git-wip-us.apache.org/repos/asf/oozie/blob/3ad35372/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 a2c75dc..8de3766 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
@@ -224,6 +224,11 @@ public class HiveMain extends LauncherMain {
arguments.add("--hiveconf");
arguments.add("hive.exec.log4j.file=" + new File(HIVE_EXEC_L4J_PROPS).getAbsolutePath());
+ //setting oozie workflow id as caller context id for hive
+ String callerId = "oozie:" + System.getProperty("oozie.job.id");
+ arguments.add("--hiveconf");
+ arguments.add("hive.log.trace.id=" + callerId);
+
String scriptPath = hiveConf.get(HiveActionExecutor.HIVE_SCRIPT);
String query = hiveConf.get(HiveActionExecutor.HIVE_QUERY);
if (scriptPath != null) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/3ad35372/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
----------------------------------------------------------------------
diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
index eaab1fe..44debbd 100644
--- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
+++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
@@ -117,6 +117,10 @@ public class PigMain extends LauncherMain {
System.out.println("Non-kerberoes execution");
}
+ //setting oozie workflow id as caller context id for pig
+ String callerId = "oozie:" + System.getProperty("oozie.job.id");
+ pigProperties.setProperty("pig.log.trace.id", callerId);
+
OutputStream os = new FileOutputStream("pig.properties");
pigProperties.store(os, "");
os.close();