You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2015/09/04 01:24:19 UTC
oozie git commit: OOZIE-2344 Enabling 'oozie.action.jobinfo.enable'
doesn't inject the job information into the map/reduce job's configuration.
(akshayrai09 via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master ea434d2f8 -> 8b5eedb5b
OOZIE-2344 Enabling 'oozie.action.jobinfo.enable' doesn't inject the job information into the map/reduce job's configuration. (akshayrai09 via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/8b5eedb5
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/8b5eedb5
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/8b5eedb5
Branch: refs/heads/master
Commit: 8b5eedb5b6564f19e8125e5028d7ce37badeaa1d
Parents: ea434d2
Author: Robert Kanter <rk...@cloudera.com>
Authored: Thu Sep 3 16:22:34 2015 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Thu Sep 3 16:24:12 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/action/hadoop/JavaActionExecutor.java | 4 +++-
release-log.txt | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/8b5eedb5/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 5eacffe..0ea2eea 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
@@ -903,6 +903,9 @@ public class JavaActionExecutor extends ActionExecutor {
launcherJobConf.setJobName(jobName);
}
+ // Inject Oozie job information if enabled.
+ injectJobInfo(launcherJobConf, actionConf, context, action);
+
String jobId = context.getWorkflow().getId();
String actionId = action.getId();
Path actionDir = context.getActionDir();
@@ -1066,7 +1069,6 @@ public class JavaActionExecutor extends ActionExecutor {
JobConf launcherJobConf = createLauncherConf(actionFs, context, action, actionXml, actionConf);
- injectJobInfo(launcherJobConf, actionConf, context, action);
injectLauncherCallback(context, launcherJobConf);
LOG.debug("Creating Job Client for action " + action.getId());
jobClient = createJobClient(context, launcherJobConf);
http://git-wip-us.apache.org/repos/asf/oozie/blob/8b5eedb5/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 3ecf02e..9c1a102 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2344 Enabling 'oozie.action.jobinfo.enable' doesn't inject the job information into the map/reduce job's configuration. (akshayrai09 via rkanter)
OOZIE-2350 Package changes for release (shwethags)
OOZIE-2347 Remove unnecessary new Configuration()/new jobConf() calls from oozie (puru)
OOZIE-2348 Recovery service keeps on recovering coord action of suspended jobs (puru)