You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2016/01/06 11:53:18 UTC
[5/9] falcon git commit: FALCON-1714 EntityNotRegisteredException
when process with no input/output feed is scheduled. Contributed by Ajay
Yadava.
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/054295a7
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/054295a7
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/054295a7
Branch: refs/heads/0.9
Commit: 054295a7de9af8b0b0f24f212a93c7bd2f27eae6
Parents: 679167a
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Jan 5 15:03:22 2016 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Tue Jan 5 15:03:22 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/054295a7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1d3aa02..597b551 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/054295a7/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);
+ }
}
}