Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75F20182DC for ; Mon, 26 Oct 2015 20:07:52 +0000 (UTC) Received: (qmail 55486 invoked by uid 500); 26 Oct 2015 20:07:30 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 55431 invoked by uid 500); 26 Oct 2015 20:07:30 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 55422 invoked by uid 99); 26 Oct 2015 20:07:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Oct 2015 20:07:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C6A3E0280; Mon, 26 Oct 2015 20:07:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ajayyadava@apache.org To: commits@falcon.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-1558 Sla API shows pending instance although _SUCCESS directory is present. Contributed by Pragya Mittal. Date: Mon, 26 Oct 2015 20:07:30 +0000 (UTC) Repository: falcon Updated Branches: refs/heads/master 7854e3d90 -> 8befa89f8 FALCON-1558 Sla API shows pending instance although _SUCCESS directory is present. Contributed by Pragya Mittal. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8befa89f Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8befa89f Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8befa89f Branch: refs/heads/master Commit: 8befa89f8572c10367b3e7a16d0a02a94e46d880 Parents: 7854e3d Author: Ajay Yadava Authored: Tue Oct 27 01:14:15 2015 +0530 Committer: Ajay Yadava Committed: Tue Oct 27 01:14:15 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- .../java/org/apache/falcon/service/FeedSLAMonitoringService.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/8befa89f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c00c265..a805aad 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,7 +19,7 @@ Trunk (Unreleased) FALCON-1554 Fix Changes.txt after 0.8 branch cut(Sowmya Ramesh) -Release version: 0.8 +Branch : 0.8 (Proposed Release version: 0.8) FALCON-1349 Upgrade falcon POM for 0.7 release(Ajay Yadava) INCOMPATIBLE CHANGES @@ -91,6 +91,8 @@ Release version: 0.8 FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1558 Sla API shows pending instance although _SUCCESS directory is present(Pragya Mittal via Ajay Yadava). + FALCON-1555 succeeded-post-processing action fails in Oozie uber mode (Pragya Mittal via Pallavi Rao) FALCON-1551 Implement setWorkingDir Method in JailedFileSystem(Pavan Kolamuri via Pallavi Rao) http://git-wip-us.apache.org/repos/asf/falcon/blob/8befa89f/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java index 67b7985..0eae0c6 100644 --- a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java +++ b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java @@ -334,7 +334,8 @@ public final class FeedSLAMonitoringService implements ConfigurationChangeListen clusterName, nominalTime); FeedInstanceStatus.AvailabilityStatus status = FeedHelper.getFeedInstanceStatus(feed, clusterName, nominalTime); - if (status == FeedInstanceStatus.AvailabilityStatus.AVAILABLE) { + if (status.equals(FeedInstanceStatus.AvailabilityStatus.AVAILABLE) + || status.equals(FeedInstanceStatus.AvailabilityStatus.EMPTY)) { LOG.debug("Feed instance(feed:{}, cluster:{}, instanceTime:{}) is available.", feed.getName(), clusterName, nominalTime); return true;