Repository: oozie Updated Branches: refs/heads/master 48c5e3884 -> c082d84b8
OOZIE-1692 modify log message when checking completion of child job in Map-Reduce action (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c082d84b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c082d84b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c082d84b Branch: refs/heads/master Commit: c082d84b86beaf943306513a3d1908da608176a5 Parents: 48c5e38 Author: egashira <[email protected]> Authored: Mon Mar 31 09:33:56 2014 -0700 Committer: egashira <[email protected]> Committed: Mon Mar 31 09:33:56 2014 -0700 ---------------------------------------------------------------------- .../apache/oozie/action/hadoop/JavaActionExecutor.java | 13 ++++++------- release-log.txt | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c082d84b/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 52a0953..44bb7d2 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 @@ -110,7 +110,6 @@ public class JavaActionExecutor extends ActionExecutor { private static final String KILLED = "KILLED"; private static final String FAILED = "FAILED"; private static final String FAILED_KILLED = "FAILED/KILLED"; - private static final String RUNNING = "RUNNING"; protected XLog LOG = XLog.getLog(getClass()); private static final Pattern heapPattern = Pattern.compile("-Xmx(([0-9]+)[mMgG])"); @@ -1228,15 +1227,15 @@ public class JavaActionExecutor extends ActionExecutor { } } else { - context.setExternalStatus(RUNNING); - LOG.info(XLog.STD, "checking action, external ID [{0}] status [{1}]", - action.getExternalId(), action.getExternalStatus()); + context.setExternalStatus("RUNNING"); + LOG.info(XLog.STD, "checking action, hadoop job ID [{0}] status [RUNNING]", + runningJob.getID()); } } else { - context.setExternalStatus(RUNNING); - LOG.info(XLog.STD, "checking action, external ID [{0}] status [{1}]", - action.getExternalId(), action.getExternalStatus()); + context.setExternalStatus("RUNNING"); + LOG.info(XLog.STD, "checking action, hadoop job ID [{0}] status [RUNNING]", + runningJob.getID()); } } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/oozie/blob/c082d84b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 809e653..c987750 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1692 modify log message when checking completion of child job in Map-Reduce action (ryota) OOZIE-1734 Oozie returned 500 Internal Server error when user passes invalid request (checha via rkanter) OOZIE-1593 Oozie HCatCredential provider needs to include hadoop rpc protection to work with encrypted secure clusters (bzhang) OOZIE-1735 Support resuming of failed coordinator job and rerun of a failed coordinator action (puru via rohini)
