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/27 18:56:42 UTC
oozie git commit: OOZIE-2678 Oozie job -kill doesn't work with tez
jobs (abhishekbafna via rohini)
Repository: oozie
Updated Branches:
refs/heads/master a7d500e88 -> 76b60cc82
OOZIE-2678 Oozie job -kill doesn't work with tez jobs (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/76b60cc8
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/76b60cc8
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/76b60cc8
Branch: refs/heads/master
Commit: 76b60cc82840c0f66b0b3a75fd01aff2f57d27ec
Parents: a7d500e
Author: Rohini Palaniswamy <ro...@apache.org>
Authored: Tue Sep 27 11:56:32 2016 -0700
Committer: Rohini Palaniswamy <ro...@apache.org>
Committed: Tue Sep 27 11:56:32 2016 -0700
----------------------------------------------------------------------
release-log.txt | 1 +
.../main/java/org/apache/oozie/action/hadoop/HiveMain.java | 1 +
.../main/java/org/apache/oozie/action/hadoop/JavaMain.java | 1 +
.../java/org/apache/oozie/action/hadoop/LauncherMain.java | 8 ++++++++
.../main/java/org/apache/oozie/action/hadoop/ShellMain.java | 2 ++
.../main/java/org/apache/oozie/action/hadoop/PigMain.java | 1 +
6 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 4805f84..ef11bb3 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -3,6 +3,7 @@
-- Oozie 4.3.0 release
+OOZIE-2678 Oozie job -kill doesn't work with tez jobs (abhishekbafna via rohini)
OOZIE-2676 Make hadoop-2 as the default profile (gezapeti via rkanter)
OOZIE-2487 Temporary workaround for Java 8 Javadoc errors (abhishekbafna via rkanter)
OOZIE-1978 Forkjoin validation code is ridiculously slow in some cases (pbacsko via rkanter)
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/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 8de3766..5866117 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
@@ -87,6 +87,7 @@ public class HiveMain extends LauncherMain {
hiveConf.addResource(new Path("file:///", actionXml));
setYarnTag(hiveConf);
+ setApplicationTags(hiveConf, TEZ_APPLICATION_TAGS);
// Propagate delegation related props from launcher job to Hive job
String delegationToken = getFilePathFromEnv("HADOOP_TOKEN_FILE_LOCATION");
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/JavaMain.java
----------------------------------------------------------------------
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/JavaMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/JavaMain.java
index e4f4b43..16bd4e6 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/JavaMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/JavaMain.java
@@ -41,6 +41,7 @@ public class JavaMain extends LauncherMain {
Configuration actionConf = loadActionConf();
setYarnTag(actionConf);
+ setApplicationTags(actionConf, TEZ_APPLICATION_TAGS);
LauncherMainHadoopUtils.killChildYarnJobs(actionConf);
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
----------------------------------------------------------------------
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
index 054f8ea..7c5713c 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java
@@ -44,6 +44,7 @@ public abstract class LauncherMain {
public static final String HADOOP_JOBS = "hadoopJobs";
public static final String MAPREDUCE_JOB_TAGS = "mapreduce.job.tags";
+ public static final String TEZ_APPLICATION_TAGS = "tez.application.tags";
protected static String[] HADOOP_SITE_FILES = new String[]
{"core-site.xml", "hdfs-site.xml", "mapred-site.xml", "yarn-site.xml"};
@@ -216,6 +217,13 @@ public abstract class LauncherMain {
}
}
+ protected static void setApplicationTags(Configuration configName, String tagConfigName) {
+ if (configName.get(MAPREDUCE_JOB_TAGS) != null) {
+ System.out.println("Setting [" + tagConfigName + "] tag: " + configName.get(MAPREDUCE_JOB_TAGS));
+ configName.set(tagConfigName, configName.get(MAPREDUCE_JOB_TAGS));
+ }
+ }
+
/**
* Utility method that copies the contents of the src file into all of the dst file(s).
* It only requires reading the src file once.
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
----------------------------------------------------------------------
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
index 5e80d00..680dbfc 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
@@ -63,6 +63,8 @@ public class ShellMain extends LauncherMain {
protected void run(String[] args) throws Exception {
Configuration actionConf = loadActionConf();
+ setYarnTag(actionConf);
+ setApplicationTags(actionConf, TEZ_APPLICATION_TAGS);
int exitCode = execute(actionConf);
if (exitCode != 0) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/76b60cc8/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 44debbd..90354f3 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
@@ -96,6 +96,7 @@ public class PigMain extends LauncherMain {
actionConf.addResource(new Path("file:///", actionXml));
setYarnTag(actionConf);
+ setApplicationTags(actionConf, TEZ_APPLICATION_TAGS);
Properties pigProperties = new Properties();
for (Map.Entry<String, String> entry : actionConf) {