falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaikid...@apache.org
Subject git commit: Falcon status throws an error when external jobids are missing. Contributed by Suhas Vasu
Date Tue, 14 Jan 2014 17:01:45 GMT
Updated Branches:
  refs/heads/master 2bd7053b0 -> 6bb539f3d


Falcon status throws an error when external jobids are missing. Contributed by Suhas Vasu


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

Branch: refs/heads/master
Commit: 6bb539f3dfdf727a6a4cc647c2a5b732c2f031a2
Parents: 2bd7053
Author: shaikidris <psychidris@gmail.com>
Authored: Tue Jan 14 22:31:17 2014 +0530
Committer: shaikidris <psychidris@gmail.com>
Committed: Tue Jan 14 22:31:17 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6bb539f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c5ceb7e..6f8f4c1 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@ Trunk (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-258 Falcon status throws an error when external jobids are missing (Suhas Vasu
via Shaik Idris)
 
     FALCON-262 Example files should use aligned dependency versions. (Jean-Baptiste Onofré
     via Shwetha GS)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6bb539f3/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 3e28c45..5a2a863 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
@@ -513,7 +513,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
                 String nominalTimeStr = SchemaHelper.formatDateUTC(coordinatorAction.getNominalTime());
                 InstancesResult.Instance instance = new InstancesResult.Instance(
                         cluster, nominalTimeStr, WorkflowStatus.valueOf(status));
-                if (coordinatorAction.getExternalId() != null) {
+                if (StringUtils.isNotEmpty(coordinatorAction.getExternalId())) {
                     WorkflowJob jobInfo = getWorkflowInfo(cluster, coordinatorAction.getExternalId());
                     instance.startTime = jobInfo.getStartTime();
                     instance.endTime = jobInfo.getEndTime();
@@ -536,7 +536,7 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
                                  Properties props) throws FalconException {
         WorkflowJob jobInfo = null;
         String status = coordinatorAction.getStatus().name();
-        if (coordinatorAction.getExternalId() != null) {
+        if (StringUtils.isNotEmpty(coordinatorAction.getExternalId())) {
             jobInfo = getWorkflowInfo(cluster, coordinatorAction.getExternalId());
             status = jobInfo.getStatus().name();
         }


Mime
View raw message