Repository: falcon Updated Branches: refs/heads/0.10 a2db9e48e -> daa21eddd
FALCON-1986 logFile retrieved when getting process instance status should be a link that points to logs â¦ould be a link that points to logs Author: Pallavi Rao <[email protected]> Reviewers: "Sandeep<[email protected]>, Peeyush<[email protected]>, Balu <[email protected]>" Closes #177 from pallavi-rao/1986 (cherry picked from commit 32be559a061e209b0fe183cf825be21ae4193136) Signed-off-by: Pallavi Rao <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/daa21edd Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/daa21edd Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/daa21edd Branch: refs/heads/0.10 Commit: daa21eddd5763372d7111fad22a9003c73eb27c3 Parents: a2db9e4 Author: Pallavi Rao <[email protected]> Authored: Wed Jun 8 11:12:18 2016 -0700 Committer: Pallavi Rao <[email protected]> Committed: Thu Jul 14 16:54:47 2016 +0530 ---------------------------------------------------------------------- .../apache/falcon/workflow/engine/OozieWorkflowEngine.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/daa21edd/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java ---------------------------------------------------------------------- diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java index 25f7180..c35f607 100644 --- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java +++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java @@ -892,7 +892,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine { if (wfJob!=null) { newInstance.startTime = wfJob.getStartTime(); newInstance.endTime = wfJob.getEndTime(); - newInstance.logFile = coordinatorAction.getId(); + newInstance.logFile = getConsoleUrl(cluster, coordinatorAction.getId()); populateInstanceActions(cluster, wfJob, newInstance); newInstance.status = WorkflowStatus.valueOf(mapActionStatus(wfJob.getStatus().name())); instanceList.add(newInstance); @@ -912,7 +912,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine { status = jobInfo.getStatus().name(); instance.startTime = jobInfo.getStartTime(); instance.endTime = jobInfo.getEndTime(); - instance.logFile = coordinatorAction.getId(); + instance.logFile = getConsoleUrl(cluster, coordinatorAction.getId()); instance.runId = jobInfo.getRun(); } @@ -984,6 +984,11 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine { } } + // This method is required as the console URL returned by Oozie for Coord Action is NULL + private String getConsoleUrl(String cluster, String actionId) throws FalconException { + return OozieClientFactory.get(cluster).getOozieUrl() + "?job=" + actionId; + } + public CoordinatorAction.Status reRunCoordAction(String cluster, CoordinatorAction coordinatorAction, Properties props, boolean isForced) throws FalconException { try {
