Repository: falcon Updated Branches: refs/heads/master 64fdab50d -> ae5ba5b01
FALCON-1100 UI : Failed to load data. 404 not found. Contributed by Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/ae5ba5b0 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/ae5ba5b0 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/ae5ba5b0 Branch: refs/heads/master Commit: ae5ba5b01cc8c0e2c8387db208fd5f9023fde614 Parents: 64fdab5 Author: Suhas Vasu <[email protected]> Authored: Fri Mar 27 01:45:01 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Fri Mar 27 01:45:01 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../java/org/apache/falcon/resource/InstancesResult.java | 2 +- .../apache/falcon/workflow/engine/OozieWorkflowEngine.java | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/ae5ba5b0/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ec0b6ca..21af5fc 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -117,6 +117,9 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1100 UI : Failed to load data. 404 not found + (Pallavi Rao via Suhas Vasu) + FALCON-1123 Stacktrace printed by Falcon CLI is not useful to user (Pallavi Rao via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/ae5ba5b0/client/src/main/java/org/apache/falcon/resource/InstancesResult.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/InstancesResult.java b/client/src/main/java/org/apache/falcon/resource/InstancesResult.java index bde5767..fc99bba 100644 --- a/client/src/main/java/org/apache/falcon/resource/InstancesResult.java +++ b/client/src/main/java/org/apache/falcon/resource/InstancesResult.java @@ -34,7 +34,7 @@ public class InstancesResult extends APIResult { * Workflow status as being set in result object. */ public static enum WorkflowStatus { - WAITING, RUNNING, SUSPENDED, KILLED, FAILED, SUCCEEDED, ERROR + WAITING, RUNNING, SUSPENDED, KILLED, FAILED, SUCCEEDED, ERROR, SKIPPED, UNDEFINED } /** http://git-wip-us.apache.org/repos/asf/falcon/blob/ae5ba5b0/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 2c399da..462e26b 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 @@ -808,7 +808,13 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine { throw new IllegalArgumentException("Unhandled action " + action); } - instance.status = WorkflowStatus.valueOf(mapActionStatus(status)); + // status can be CoordinatorAction.Status, WorkflowJob.Status or Job.Status + try { + instance.status = WorkflowStatus.valueOf(mapActionStatus(status)); + } catch (IllegalArgumentException e) { + LOG.error("Job status not defined in Instance status: {}", status); + instance.status = WorkflowStatus.UNDEFINED; + } } private void reRunCoordAction(String cluster, CoordinatorAction coordinatorAction) throws FalconException {
