Repository: falcon Updated Branches: refs/heads/0.6.1 89c2749f7 -> 74856a911
FALCON-1141 Reverse Lookup for feed in prism fails with BadRequest. 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/74856a91 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/74856a91 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/74856a91 Branch: refs/heads/0.6.1 Commit: 74856a9112ff6718c63f0b7a83614e0e6ee9d610 Parents: 89c2749 Author: Suhas Vasu <[email protected]> Authored: Thu Apr 9 14:55:46 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Thu Apr 9 14:55:46 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 14 +++----------- .../falcon/entity/store/ConfigurationStore.java | 5 ++++- 2 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/74856a91/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7cbb573..eee5fb6 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,16 +1,5 @@ Apache Falcon Change log -Trunk (Unreleased) - INCOMPATIBLE CHANGES - - NEW FEATURES - - IMPROVEMENTS - - OPTIMIZATIONS - - BUG FIXES - Branch: 0.6.1 (Proposed Release Version: 0.6.1) FALCON-1134 Create branch 0.6.1 and update version to 0.6.1 (Shaik Idris Ali) @@ -148,6 +137,9 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1) (Suhas vasu) BUG FIXES + FALCON-1141 Reverse Lookup for feed in prism fails with BadRequest + (Ajay Yadava via Suhas Vasu) + FALCON-1144 Dynamic partitions not getting registered in Hcat (Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/74856a91/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java index 1c1c325..b84371f 100644 --- a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java +++ b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java @@ -55,6 +55,9 @@ import java.util.concurrent.ConcurrentHashMap; */ public final class ConfigurationStore implements FalconService { + private static final EntityType[] ENTITY_LOAD_ORDER = new EntityType[] { + EntityType.CLUSTER, EntityType.FEED, EntityType.PROCESS, }; + private static final Logger LOG = LoggerFactory.getLogger(ConfigurationStore.class); private static final Logger AUDIT = LoggerFactory.getLogger("AUDIT"); private static final String UTF_8 = CharEncoding.UTF_8; @@ -135,7 +138,7 @@ public final class ConfigurationStore implements FalconService { } try { - for (EntityType type : EntityType.values()) { + for (EntityType type : ENTITY_LOAD_ORDER) { ConcurrentHashMap<String, Entity> entityMap = dictionary.get(type); FileStatus[] files = fs.globStatus(new Path(storePath, type.name() + Path.SEPARATOR + "*")); if (files != null) {
