Repository: falcon Updated Branches: refs/heads/master bc75a5f99 -> f821219f1
FALCON-1143 Correcting order of entities on reload. 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/f821219f Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f821219f Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f821219f Branch: refs/heads/master Commit: f821219f13bf3a7c240862888a157e72b98f7bfc Parents: bc75a5f Author: Suhas Vasu <[email protected]> Authored: Thu Apr 9 14:34:26 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Thu Apr 9 14:34:26 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../java/org/apache/falcon/entity/store/ConfigurationStore.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f821219f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9e06d4c..2b7f2a2 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,9 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-1143 Correcting order of entities on reload + (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/f821219f/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) {
