Repository: falcon Updated Branches: refs/heads/master 2b0ad65a4 -> 21f0b6978
FALCON-2263 Deletion of entities for an extension has to have a specific order of deleting processes first and then feeds Author: sandeep <[email protected]> Author: sandeep.samudrala <[email protected]> Reviewers: @pallavi-rao Closes #347 from sandeepSamudrala/FALCON-2263 and squashes the following commits: bc75ff2 [sandeep.samudrala] resolved merge conflicts 2850609 [sandeep.samudrala] Merge branch 'master' of https://github.com/apache/falcon into FALCON-2263 984e44e [sandeep] FALCON-2263 Deletion of entities for an extension has to have a specific order of deleting processes first and then feeds 7de7798 [sandeep] go -b FALCON-2263Merge branch 'master' of https://github.com/apache/falcon c5da0a2 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 7e16263 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a234d94 [sandeep] FALCON-2231 Incoporated review comments and small fixes for duplicate submission and colo addition to schedule command 26e3350 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 73fbf75 [sandeep] Merge branch 'master' of https://github.com/apache/falcon cc28658 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 089b10d [sandeep] Merge branch 'master' of https://github.com/apache/falcon 456d4ee [sandeep] Merge branch 'master' of https://github.com/apache/falcon 0cf9af6 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 4a2e23e [sandeep] Merge branch 'master' of https://github.com/apache/falcon b1546ed [sandeep] Merge branch 'master' of https://github.com/apache/falcon 0a433fb [sandeep] Merge branch 'master' of https://github.com/apache/falcon 194f36a [sandeep] Merge branch 'master' of https://github.com/apache/falcon e0ad358 [sandeep] Merge branch 'master' of https://github.com/apache/falcon f96a084 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 9cf36e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon bbca081 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 48f6afa [sandeep] Merge branch 'master' of https://github.com/apache/falcon 250cc46 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d0393e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a178805 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d6dc8bf [sandeep] Merge branch 'master' of https://github.com/apache/falcon 1bb8d3c [sandeep] Merge branch 'master' of https://github.com/apache/falcon c065566 [sandeep] reverting last line changes made 1a4dcd2 [sandeep] rebased and resolved the conflicts from master 271318b [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time with Delay. a94d4fe [sandeep] rebasing from master 9e68a57 [sandeep] FALCON-298. Feed update with replication delay creates holes Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/21f0b697 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/21f0b697 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/21f0b697 Branch: refs/heads/master Commit: 21f0b69782d4e9008088c491d5101d89bba09bd6 Parents: 2b0ad65 Author: sandeep <[email protected]> Authored: Wed Jan 25 09:01:39 2017 +0530 Committer: Pallavi Rao <[email protected]> Committed: Wed Jan 25 09:01:39 2017 +0530 ---------------------------------------------------------------------- .../java/org/apache/falcon/resource/AbstractExtensionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/21f0b697/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java index bb473f9..e1b62ad 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java @@ -169,7 +169,7 @@ public class AbstractExtensionManager extends AbstractSchedulableEntityManager { protected SortedMap<EntityType, List<String>> getJobEntities(ExtensionJobsBean extensionJobsBean) throws FalconException { - TreeMap<EntityType, List<String>> entityMap = new TreeMap<>(); + TreeMap<EntityType, List<String>> entityMap = new TreeMap<>(Collections.<EntityType>reverseOrder()); entityMap.put(EntityType.PROCESS, extensionJobsBean.getProcesses()); entityMap.put(EntityType.FEED, extensionJobsBean.getFeeds()); return entityMap;
