[2/2] oozie git commit: OOZIE-2916 Set a job name for the MR Action's child job (asasvari)
OOZIE-2916 Set a job name for the MR Action's child job (asasvari)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/5e1c9d36
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5e1c9d36
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5e1c9d36
Branch: refs/heads/master
Commit: 5e1c9d362afe1b2c6423a386aeac7f04d3337f65
Parents: efc7a82
Author: Attila Sasvari
Authored: Mon Sep 11 12:00:58 2017 +0200
Committer: Attila Sasvari
Committed: Mon Sep 11 12:00:58 2017 +0200
--
.../oozie/action/hadoop/JavaActionExecutor.java | 22 +++-
.../action/hadoop/MapReduceActionExecutor.java | 10 ++
.../action/hadoop/TestJavaActionExecutor.java | 1 -
release-log.txt | 1 +
.../hadoop/TestMapReduceActionExecutor.java | 109 +--
5 files changed, 77 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/oozie/blob/5e1c9d36/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
--
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index bca79aa..49fd4b8 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -147,6 +147,7 @@ public class JavaActionExecutor extends ActionExecutor {
private static final String JAVA_MAIN_CLASS_NAME =
"org.apache.oozie.action.hadoop.JavaMain";
private static final String HADOOP_JOB_NAME = "mapred.job.name";
private static final Set DISALLOWED_PROPERTIES = new
HashSet();
+private static final String OOZIE_ACTION_NAME = "oozie.action.name";
private static int maxActionOutputLen;
private static int maxExternalStatsSize;
@@ -944,6 +945,7 @@ public class JavaActionExecutor extends ActionExecutor {
// action job configuration
Configuration actionConf = loadHadoopDefaultResources(context,
actionXml);
+addAppNameContext(action, context);
setupActionConf(actionConf, context, actionXml, appPathRoot);
LOG.debug("Setting LibFilesArchives ");
setLibFilesArchives(context, actionXml, appPathRoot, actionConf);
@@ -1072,6 +1074,19 @@ public class JavaActionExecutor extends ActionExecutor {
}
}
+protected void addAppNameContext(WorkflowAction action, Context context) {
+String oozieActionName =
String.format("oozie:launcher:T=%s:W=%s:A=%s:ID=%s",
+getType(),
+context.getWorkflow().getAppName(),
+action.getName(),
+context.getWorkflow().getId());
+context.setVar(OOZIE_ACTION_NAME, oozieActionName);
+}
+
+protected String getAppName(Context context) {
+return context.getVar(OOZIE_ACTION_NAME);
+}
+
private Credentials ensureCredentials(final Credentials credentials) {
if (credentials == null) {
LOG.debug("No credentials present, creating a new one.");
@@ -1129,13 +1144,10 @@ public class JavaActionExecutor extends ActionExecutor {
ApplicationSubmissionContext appContext =
Records.newRecord(ApplicationSubmissionContext.class);
-String jobName = XLog.format(
-"oozie:launcher:T={0}:W={1}:A={2}:ID={3}", getType(),
-context.getWorkflow().getAppName(), actionName,
-context.getWorkflow().getId());
+String appName = getAppName(context);
appContext.setApplicationId(appId);
-appContext.setApplicationName(jobName);
+appContext.setApplicationName(appName);
appContext.setApplicationType("Oozie Launcher");
Priority pri = Records.newRecord(Priority.class);
int priority = 0; // TODO: OYA: Add a constant or a config
http://git-wip-us.apache.org/repos/asf/oozie/blob/5e1c9d36/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
--
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index 338e508..22d5526 100644
---
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.
oozie git commit: OOZIE-2916 Set a job name for the MR Action's child job (asasvari)
Repository: oozie
Updated Branches:
refs/heads/master 71d3ddc31 -> 82925e4d2
OOZIE-2916 Set a job name for the MR Action's child job (asasvari)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/82925e4d
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/82925e4d
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/82925e4d
Branch: refs/heads/master
Commit: 82925e4d21796fd4dc1c9648f00677b98d7dbb81
Parents: 71d3ddc
Author: Attila Sasvari
Authored: Mon Sep 11 11:46:09 2017 +0200
Committer: Attila Sasvari
Committed: Mon Sep 11 11:46:09 2017 +0200
--
.../oozie/action/hadoop/JavaActionExecutor.java | 22 +++-
.../action/hadoop/MapReduceActionExecutor.java | 10 ++
.../action/hadoop/TestJavaActionExecutor.java | 1 -
release-log.txt | 1 +
.../hadoop/TestMapReduceActionExecutor.java | 109 +--
5 files changed, 77 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/oozie/blob/82925e4d/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
--
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index bca79aa..2b1cc7d 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -147,6 +147,7 @@ public class JavaActionExecutor extends ActionExecutor {
private static final String JAVA_MAIN_CLASS_NAME =
"org.apache.oozie.action.hadoop.JavaMain";
private static final String HADOOP_JOB_NAME = "mapred.job.name";
private static final Set DISALLOWED_PROPERTIES = new
HashSet();
+public static final String OOZIE_ACTION_NAME = "oozie.action.name";
private static int maxActionOutputLen;
private static int maxExternalStatsSize;
@@ -944,6 +945,7 @@ public class JavaActionExecutor extends ActionExecutor {
// action job configuration
Configuration actionConf = loadHadoopDefaultResources(context,
actionXml);
+addAppNameContext(action, context);
setupActionConf(actionConf, context, actionXml, appPathRoot);
LOG.debug("Setting LibFilesArchives ");
setLibFilesArchives(context, actionXml, appPathRoot, actionConf);
@@ -1072,6 +1074,19 @@ public class JavaActionExecutor extends ActionExecutor {
}
}
+protected void addAppNameContext(WorkflowAction action, Context context) {
+String oozieActionName =
String.format("oozie:launcher:T=%s:W=%s:A=%s:ID=%s",
+getType(),
+context.getWorkflow().getAppName(),
+action.getName(),
+context.getWorkflow().getId());
+context.setVar(OOZIE_ACTION_NAME, oozieActionName);
+}
+
+protected String getAppName(Context context) {
+return context.getVar(OOZIE_ACTION_NAME);
+}
+
private Credentials ensureCredentials(final Credentials credentials) {
if (credentials == null) {
LOG.debug("No credentials present, creating a new one.");
@@ -1129,13 +1144,10 @@ public class JavaActionExecutor extends ActionExecutor {
ApplicationSubmissionContext appContext =
Records.newRecord(ApplicationSubmissionContext.class);
-String jobName = XLog.format(
-"oozie:launcher:T={0}:W={1}:A={2}:ID={3}", getType(),
-context.getWorkflow().getAppName(), actionName,
-context.getWorkflow().getId());
+String appName = getAppName(context);
appContext.setApplicationId(appId);
-appContext.setApplicationName(jobName);
+appContext.setApplicationName(appName);
appContext.setApplicationType("Oozie Launcher");
Priority pri = Records.newRecord(Priority.class);
int priority = 0; // TODO: OYA: Add a constant or a config
http://git-wip-us.apache.org/repos/asf/oozie/blob/82925e4d/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
--
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index 338e508..22d5526 100644
---
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Co
