falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pall...@apache.org
Subject falcon git commit: FALCON-2128 Status api shows timeout instances as failed
Date Tue, 06 Sep 2016 09:18:42 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 803211817 -> c3697de62


FALCON-2128 Status api shows timeout instances as failed

Author: sandeep <sandysmdl@gmail.com>

Reviewers: @pallavi-rao

Closes #276 from sandeepSamudrala/FALCON-2128 and squashes the following commits:

3d47a11 [sandeep] FALCON-2128 Status api shows timeout instances as failed
f4c6850 [sandeep] Merge branch 'master' of https://github.com/apache/falcon into FALCON-2128
d6dc8bf [sandeep] Merge branch 'master' of https://github.com/apache/falcon
1bb8d3c [sandeep] Merge branch 'master' of https://github.com/apache/falcon
c065566 [sandeep] reverting last line changes made
1a4dcd2 [sandeep] rebased and resolved the conflicts from master
271318b [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time
with Delay.
a94d4fe [sandeep] rebasing from master
9e68a57 [sandeep] FALCON-298. Feed update with replication delay creates holes


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/c3697de6
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c3697de6
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c3697de6

Branch: refs/heads/master
Commit: c3697de622e4ce077db7e569b74fc363883a704a
Parents: 8032118
Author: sandeep <sandysmdl@gmail.com>
Authored: Tue Sep 6 14:48:30 2016 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Tue Sep 6 14:48:30 2016 +0530

----------------------------------------------------------------------
 .../src/main/java/org/apache/falcon/resource/InstancesResult.java | 3 ++-
 .../org/apache/falcon/workflow/engine/OozieWorkflowEngine.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/c3697de6/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 3dc74c4..645050c 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,8 @@ public class InstancesResult extends APIResult {
      * Workflow status as being set in result object.
      */
     public static enum WorkflowStatus {
-        WAITING, RUNNING, SUSPENDED, KILLED, FAILED, SUCCEEDED, ERROR, SKIPPED, UNDEFINED,
READY, KILLED_OR_IGNORED
+        WAITING, RUNNING, SUSPENDED, KILLED, FAILED, SUCCEEDED, ERROR, SKIPPED, UNDEFINED,
READY, KILLED_OR_IGNORED,
+        TIMEDOUT
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/falcon/blob/c3697de6/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 c371d69..394600c 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
@@ -1118,7 +1118,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
         } else if (CoordinatorAction.Status.IGNORED.toString().equals(status)) {
             return InstancesResult.WorkflowStatus.KILLED_OR_IGNORED.name();
         } else if (CoordinatorAction.Status.TIMEDOUT.toString().equals(status)) {
-            return InstancesResult.WorkflowStatus.FAILED.name();
+            return InstancesResult.WorkflowStatus.TIMEDOUT.name();
         } else if (WorkflowJob.Status.PREP.toString().equals(status)) {
             return InstancesResult.WorkflowStatus.RUNNING.name();
         } else {


Mime
View raw message