You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/02/16 20:34:24 UTC

[1/2] git commit: [HELIX-382] GenericHelixController now implements InstanceConfigChangeListener, ConfigChangeListener delegates call to InstanceConfigChangeListener

Repository: helix
Updated Branches:
  refs/heads/helix-0.6.2-release 4e881378c -> fc1512305


[HELIX-382] GenericHelixController now implements InstanceConfigChangeListener, ConfigChangeListener delegates call to InstanceConfigChangeListener


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/c3ccd063
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/c3ccd063
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/c3ccd063

Branch: refs/heads/helix-0.6.2-release
Commit: c3ccd0635d22728f48231b6c613ba27dade0995d
Parents: c924280
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Sun Feb 16 11:32:34 2014 -0800
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Sun Feb 16 11:32:34 2014 -0800

----------------------------------------------------------------------
 .../apache/helix/controller/GenericHelixController.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/c3ccd063/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
index 7e28399..a606b26 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
@@ -37,6 +37,7 @@ import org.apache.helix.HealthStateChangeListener;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixManager;
 import org.apache.helix.IdealStateChangeListener;
+import org.apache.helix.InstanceConfigChangeListener;
 import org.apache.helix.LiveInstanceChangeListener;
 import org.apache.helix.MessageListener;
 import org.apache.helix.NotificationContext;
@@ -86,7 +87,8 @@ import org.apache.log4j.Logger;
  */
 public class GenericHelixController implements ConfigChangeListener, IdealStateChangeListener,
     LiveInstanceChangeListener, MessageListener, CurrentStateChangeListener,
-    ExternalViewChangeListener, ControllerChangeListener, HealthStateChangeListener {
+    ExternalViewChangeListener, ControllerChangeListener, HealthStateChangeListener,
+    InstanceConfigChangeListener{
   private static final Logger logger = Logger.getLogger(GenericHelixController.class.getName());
   volatile boolean init = false;
   private final PipelineRegistry _registry;
@@ -434,6 +436,14 @@ public class GenericHelixController implements ConfigChangeListener, IdealStateC
   }
 
   @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()");
     if (changeContext != null && changeContext.getType() == Type.FINALIZE) {

[2/2] git commit: Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.2-release

Posted by ka...@apache.org.
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 <ka...@hotmail.com>
Authored: Sun Feb 16 11:32:46 2014 -0800
Committer: Kanak Biscuitwala <ka...@hotmail.com>
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;