Repository: falcon Updated Branches: refs/heads/master 5ff837819 -> 011059b86
FALCON-1747 Falcon instance status listing is throwing error message. Contributed by Peeyush Bishnoi. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/011059b8 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/011059b8 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/011059b8 Branch: refs/heads/master Commit: 011059b8620c6ea83f6ed4621d4591e58ac2b4b2 Parents: 5ff8378 Author: peeyush b <[email protected]> Authored: Wed Jan 27 18:37:26 2016 +0530 Committer: peeyush b <[email protected]> Committed: Wed Jan 27 18:37:26 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/falcon/resource/AbstractInstanceManager.java | 5 +++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/011059b8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 90b32ca..ef6f608 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -123,6 +123,8 @@ Proposed Release Version: 0.9 OPTIMIZATIONS BUG FIXES + FALCON-1747 Falcon instance status listing is throwing error message (Peeyush Bishnoi) + FALCON-1758 APIs fail when oozie workflow entries are deleted (Pavan Kolamuri via Pallavi Rao) FALCON-1754 JobCompletionService throws FalconException (Pallavi Rao) http://git-wip-us.apache.org/repos/asf/falcon/blob/011059b8/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java index 4001d55..b35ae9a 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java @@ -920,6 +920,11 @@ public abstract class AbstractInstanceManager extends AbstractEntityManager { } start = new Date(startMillis); + if (start.after(end)) { + LOG.warn("Calculated start date : {} crossed end date : {} setting it to " + + "entity start date", start, end); + start = clusterStartDate; + } } else { start = EntityUtil.parseDateUTC(startStr); }
