falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suh...@apache.org
Subject falcon git commit: FALCON-1127 Falcon entity status is submitted when corresponding Bundle is runningwitherror. Contributed by Pallavi Rao
Date Wed, 22 Apr 2015 06:03:56 GMT
Repository: falcon
Updated Branches:
  refs/heads/master df0c8d35a -> 3db317f8a


FALCON-1127 Falcon entity status is submitted when corresponding Bundle is runningwitherror.
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/3db317f8
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3db317f8
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3db317f8

Branch: refs/heads/master
Commit: 3db317f8a49f7e1d87de656b00019d541f9dbe5d
Parents: df0c8d3
Author: Suhas Vasu <suhas.v@inmobi.com>
Authored: Wed Apr 22 11:33:34 2015 +0530
Committer: Suhas Vasu <suhas.v@inmobi.com>
Committed: Wed Apr 22 11:33:34 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                   | 4 ++++
 .../apache/falcon/workflow/engine/OozieWorkflowEngine.java    | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/3db317f8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7105dd..267b01e 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,12 @@ Trunk (Unreleased)
   NEW FEATURES
 
   IMPROVEMENTS
+    FALCON-1127 Falcon entity status is submitted when corresponding Bundle
+    is runningwitherror(Pallavi Rao via Suhas Vasu)
+
     FALCON-1142 ClusterEntityParserTest.testClusterWithOnlyStaging
     fails when run alone(Pallavi Rao via Suhas Vasu)
+
     FALCON-1152 Names of Xml attributes and Class member variables
     are inconsistent(Ajay Yadava)
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/3db317f8/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 aef5ad2..2dc42b4 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
@@ -94,10 +94,11 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
 
     private static final List<Job.Status> BUNDLE_ACTIVE_STATUS =
         Arrays.asList(Job.Status.PREP, Job.Status.RUNNING, Job.Status.SUSPENDED, Job.Status.PREPSUSPENDED,
-            Job.Status.DONEWITHERROR);
+            Job.Status.RUNNINGWITHERROR, Job.Status.PAUSED, Status.PREPPAUSED, Status.PAUSEDWITHERROR);
     private static final List<Job.Status> BUNDLE_SUSPENDED_STATUS =
-        Arrays.asList(Job.Status.PREPSUSPENDED, Job.Status.SUSPENDED);
-    private static final List<Job.Status> BUNDLE_RUNNING_STATUS = Arrays.asList(Job.Status.PREP,
Job.Status.RUNNING);
+        Arrays.asList(Job.Status.PREPSUSPENDED, Job.Status.SUSPENDED, Status.SUSPENDEDWITHERROR);
+    private static final List<Job.Status> BUNDLE_RUNNING_STATUS = Arrays.asList(Job.Status.PREP,
Job.Status.RUNNING,
+            Job.Status.RUNNINGWITHERROR);
 
     private static final List<Job.Status> BUNDLE_SUSPEND_PRECOND =
         Arrays.asList(Job.Status.PREP, Job.Status.RUNNING, Job.Status.DONEWITHERROR);


Mime
View raw message