Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.2-release
Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/fc151230 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/fc151230 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/fc151230 Branch: refs/heads/helix-0.6.2-release Commit: fc1512305c218cc7b95055676a2ecfef5ad9b79b Parents: c3ccd06 4e88137 Author: Kanak Biscuitwala <[email protected]> Authored: Sun Feb 16 11:32:46 2014 -0800 Committer: Kanak Biscuitwala <[email protected]> Committed: Sun Feb 16 11:32:46 2014 -0800 ---------------------------------------------------------------------- .../controller/GenericHelixController.java | 40 ++ .../controller/stages/ClusterDataCache.java | 171 ++++- .../controller/stages/ReadClusterDataStage.java | 12 +- .../controller/stages/TaskAssignmentStage.java | 5 + .../apache/helix/manager/zk/ZKHelixManager.java | 7 +- .../helix/manager/zk/ZkBaseDataAccessor.java | 3 + .../manager/zk/ZkCacheBaseDataAccessor.java | 5 +- .../store/zk/AutoFallbackPropertyStore.java | 332 ++++++++++ .../src/test/java/org/apache/helix/Mocks.java | 2 +- .../stages/TestRebalancePipeline.java | 21 +- .../TestReelectedPipelineCorrectness.java | 151 +++++ .../store/zk/TestAutoFallbackPropertyStore.java | 625 +++++++++++++++++++ .../zk/TestZkManagerWithAutoFallbackStore.java | 115 ++++ 13 files changed, 1451 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/fc151230/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java ---------------------------------------------------------------------- diff --cc helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java index a606b26,6db82fc..4ff47fb --- a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java +++ b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java @@@ -436,16 -473,9 +475,17 @@@ public class GenericHelixController imp } @Override + public void onInstanceConfigChange(List<InstanceConfig> instanceConfigs, + NotificationContext changeContext){ + logger.info("START: GenericClusterController.onInstanceConfigChange()"); + onConfigChange(instanceConfigs, changeContext); + logger.info("END: GenericClusterController.onInstanceConfigChange()"); + } + + @Override public void onControllerChange(NotificationContext changeContext) { logger.info("START: GenericClusterController.onControllerChange()"); + _cache.requireFullRefresh(); if (changeContext != null && changeContext.getType() == Type.FINALIZE) { logger.info("GenericClusterController.onControllerChange() FINALIZE"); return;
