Repository: oozie Updated Branches: refs/heads/master d7b7878ce -> 88fc6e554
OOZIE-2648 Child jobs shouldn't send callbacks to Oozie (abhishekbafna via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/88fc6e55 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/88fc6e55 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/88fc6e55 Branch: refs/heads/master Commit: 88fc6e554ca7e73dba89d40aa87b97bfb5a3e881 Parents: d7b7878 Author: Robert Kanter <[email protected]> Authored: Tue Sep 13 15:15:35 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Tue Sep 13 15:15:35 2016 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 4 ++-- .../apache/oozie/action/hadoop/MapReduceActionExecutor.java | 6 ++++++ release-log.txt | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/88fc6e55/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 0574584..ad07b57 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 @@ -1042,7 +1042,7 @@ public class JavaActionExecutor extends ActionExecutor { return disable; } - private void injectCallback(Context context, Configuration conf) { + protected void injectCallback(Context context, Configuration conf) { String callback = context.getCallbackUrl("$jobStatus"); if (conf.get("job.end.notification.url") != null) { LOG.warn("Overriding the action job end notification URI"); @@ -1051,7 +1051,7 @@ public class JavaActionExecutor extends ActionExecutor { } void injectActionCallback(Context context, Configuration actionConf) { - injectCallback(context, actionConf); + // action callback needs to be injected only for mapreduce actions. } void injectLauncherCallback(Context context, Configuration launcherConf) { http://git-wip-us.apache.org/repos/asf/oozie/blob/88fc6e55/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 de8290e..c36a675 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 @@ -343,4 +343,10 @@ public class MapReduceActionExecutor extends JavaActionExecutor { return runningJob; } + + @Override + void injectActionCallback(Context context, Configuration actionConf) { + injectCallback(context, actionConf); + } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/88fc6e55/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a525fd1..6f0b7b7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2648 Child jobs shouldn't send callbacks to Oozie (abhishekbafna via rkanter) OOZIE-2584 Eliminate Thread.sleep() calls in TestMemoryLocks (pbacsko via rkanter) OOZIE-2635 TimeZone.getTimeZone has performance issue. (satishsaley via rkanter) OOZIE-2583 oozie throws EL Exception when reference variable name containing dot (abhishekbafna via jaydeepvishwakarma)
