falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject falcon git commit: FALCON-1714 EntityNotRegisteredException when process with no input/output feed is scheduled. Contributed by Ajay Yadava.
Date Tue, 05 Jan 2016 10:23:26 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.9 4b20687cd -> 35cbdd38e


FALCON-1714 EntityNotRegisteredException when process with no input/output feed is scheduled.
Contributed by Ajay Yadava.


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

Branch: refs/heads/0.9
Commit: 35cbdd38e4eb98660cc8fd6edd9ac660714ee02a
Parents: 4b20687
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Tue Jan 5 15:52:14 2016 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Tue Jan 5 15:52:14 2016 +0530

----------------------------------------------------------------------
 CHANGES.txt                                            |  2 ++
 .../apache/falcon/handler/SLAMonitoringHandler.java    | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/35cbdd38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3c5d3df..87a3aaa 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -90,6 +90,8 @@ Proposed Release Version: 0.9
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1714 EntityNotRegisteredException when process with no input/output feed is scheduled(Ajay
Yadava)
+
     FALCON-1674 Fix the mapping of InstanceState status to workflow Status in InstancesResult(Pallavi
Rao via Ajay Yadava)
 
     FALCON-1709 FIFO order is not followed when scheduled using native scheduler (Pallavi
Rao)

http://git-wip-us.apache.org/repos/asf/falcon/blob/35cbdd38/prism/src/main/java/org/apache/falcon/handler/SLAMonitoringHandler.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/handler/SLAMonitoringHandler.java b/prism/src/main/java/org/apache/falcon/handler/SLAMonitoringHandler.java
index bb3b8e0..df2a1e0 100644
--- a/prism/src/main/java/org/apache/falcon/handler/SLAMonitoringHandler.java
+++ b/prism/src/main/java/org/apache/falcon/handler/SLAMonitoringHandler.java
@@ -18,6 +18,7 @@
 package org.apache.falcon.handler;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.falcon.FalconException;
 import org.apache.falcon.entity.EntityUtil;
 import org.apache.falcon.entity.FeedHelper;
@@ -53,12 +54,14 @@ public class SLAMonitoringHandler implements WorkflowExecutionListener
{
                                      String[] outputFeedInstancePathsList) throws FalconException
{
         Storage storage;
         for (int index=0; index<outputFeedNamesList.length; index++) {
-            Feed feed = EntityUtil.getEntity(EntityType.FEED, outputFeedNamesList[index]);
-            storage = FeedHelper.createStorage(clusterName, feed);
-            String templatePath = new Path(storage.getUriTemplate(LocationType.DATA)).toUri().getPath();
-            Date date = FeedHelper.getDate(templatePath, new Path(outputFeedInstancePathsList[index]),
+            if (!StringUtils.equals(outputFeedNamesList[index], "NONE")) {
+                Feed feed = EntityUtil.getEntity(EntityType.FEED, outputFeedNamesList[index]);
+                storage = FeedHelper.createStorage(clusterName, feed);
+                String templatePath = new Path(storage.getUriTemplate(LocationType.DATA)).toUri().getPath();
+                Date date = FeedHelper.getDate(templatePath, new Path(outputFeedInstancePathsList[index]),
                     EntityUtil.getTimeZone(feed));
-            FeedSLAMonitoringService.get().makeFeedInstanceAvailable(outputFeedNamesList[index],
clusterName, date);
+                FeedSLAMonitoringService.get().makeFeedInstanceAvailable(outputFeedNamesList[index],
clusterName, date);
+            }
         }
     }
 


Mime
View raw message