Repository: falcon Updated Branches: refs/heads/master 86180d932 -> 666a2a26b
FALCON-1530 SLAMonitoring API is not honouring delete feature. 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/666a2a26 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/666a2a26 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/666a2a26 Branch: refs/heads/master Commit: 666a2a26b6e9d1f4176057e7c54d1120dc8d8fd0 Parents: 86180d9 Author: Ajay Yadava <[email protected]> Authored: Tue Oct 13 10:45:25 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Tue Oct 13 10:45:25 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../java/org/apache/falcon/service/FeedSLAMonitoringService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/666a2a26/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d5c9c1d..6e8486f 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -65,6 +65,7 @@ Trunk (Unreleased) FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1530 SLAMonitoring API is not honouring delete feature(Ajay Yadava). FALCON-1532 Incorrect documentation in SLA monitoring(Pragya Mittal via Ajay Yadava) FALCON-1466 Flaky unit tests in Proxy user feature(Sowmya Ramesh) http://git-wip-us.apache.org/repos/asf/falcon/blob/666a2a26/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 b4e0427..67b7985 100644 --- a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java +++ b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java @@ -171,7 +171,7 @@ public final class FeedSLAMonitoringService implements ConfigurationChangeListen for (Cluster cluster : feed.getClusters().getClusters()) { if (currentClusters.contains(cluster.getName())) { monitoredFeeds.remove(feed.getName()); - break; + pendingInstances.remove(new Pair<>(feed.getName(), cluster.getName())); } } }
