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/06/05 19:31:02 UTC

git commit: [HELIX-452] Increase frequency of status update cleanup

Repository: helix
Updated Branches:
  refs/heads/helix-0.6.2-release 87806c1c7 -> 9412fb56e


[HELIX-452] Increase frequency of status update cleanup


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

Branch: refs/heads/helix-0.6.2-release
Commit: 9412fb56e71d402d5a93549093c4cee7aa97be3c
Parents: 87806c1
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Jun 5 10:26:13 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Jun 5 10:26:13 2014 -0700

----------------------------------------------------------------------
 .../controller/stages/BestPossibleStateCalcStage.java | 14 +++++++++-----
 .../helix/manager/zk/ControllerManagerHelper.java     |  2 ++
 .../org/apache/helix/manager/zk/ZKHelixManager.java   | 14 ++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/9412fb56/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateCalcStage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateCalcStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateCalcStage.java
index a4aa4a3..e016802 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateCalcStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/BestPossibleStateCalcStage.java
@@ -62,11 +62,15 @@ public class BestPossibleStateCalcStage extends AbstractBaseStage {
         compute(event, resourceMap, currentStateOutput);
     event.addAttribute(AttributeName.BEST_POSSIBLE_STATE.toString(), bestPossibleStateOutput);
 
-    ClusterStatusMonitor clusterStatusMonitor =
-        (ClusterStatusMonitor) event.getAttribute("clusterStatusMonitor");
-    if (clusterStatusMonitor != null) {
-      clusterStatusMonitor.setPerInstanceResourceStatus(bestPossibleStateOutput,
-          cache.getInstanceConfigMap(), resourceMap, cache.getStateModelDefMap());
+    try {
+      ClusterStatusMonitor clusterStatusMonitor =
+          (ClusterStatusMonitor) event.getAttribute("clusterStatusMonitor");
+      if (clusterStatusMonitor != null) {
+        clusterStatusMonitor.setPerInstanceResourceStatus(bestPossibleStateOutput,
+            cache.getInstanceConfigMap(), resourceMap, cache.getStateModelDefMap());
+      }
+    } catch (Exception e) {
+      logger.error("Could not update cluster status metrics!", e);
     }
 
     long endTime = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/helix/blob/9412fb56/helix-core/src/main/java/org/apache/helix/manager/zk/ControllerManagerHelper.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ControllerManagerHelper.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ControllerManagerHelper.java
index d2b520b..9a817e3 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ControllerManagerHelper.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ControllerManagerHelper.java
@@ -56,10 +56,12 @@ public class ControllerManagerHelper {
           new DefaultControllerMessageHandlerFactory();
       _messagingService.getExecutor().registerMessageHandlerFactory(
           defaultControllerMsgHandlerFactory.getMessageType(), defaultControllerMsgHandlerFactory);
+
       MessageHandlerFactory defaultSchedulerMsgHandlerFactory =
           new DefaultSchedulerMessageHandlerFactory(_manager);
       _messagingService.getExecutor().registerMessageHandlerFactory(
           defaultSchedulerMsgHandlerFactory.getMessageType(), defaultSchedulerMsgHandlerFactory);
+
       MessageHandlerFactory defaultParticipantErrorMessageHandlerFactory =
           new DefaultParticipantErrorMessageHandlerFactory(_manager);
       _messagingService.getExecutor().registerMessageHandlerFactory(

http://git-wip-us.apache.org/repos/asf/helix/blob/9412fb56/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index 18e3294..d92cc7d 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -37,11 +37,12 @@ import org.apache.helix.CurrentStateChangeListener;
 import org.apache.helix.ExternalViewChangeListener;
 import org.apache.helix.HealthStateChangeListener;
 import org.apache.helix.HelixAdmin;
+import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.HelixException;
 import org.apache.helix.HelixManager;
+import org.apache.helix.HelixManagerProperties;
 import org.apache.helix.HelixTimerTask;
-import org.apache.helix.HelixConstants.ChangeType;
 import org.apache.helix.IdealStateChangeListener;
 import org.apache.helix.InstanceConfigChangeListener;
 import org.apache.helix.InstanceType;
@@ -49,7 +50,6 @@ import org.apache.helix.LiveInstanceChangeListener;
 import org.apache.helix.LiveInstanceInfoProvider;
 import org.apache.helix.MessageListener;
 import org.apache.helix.PreConnectCallback;
-import org.apache.helix.HelixManagerProperties;
 import org.apache.helix.PropertyKey;
 import org.apache.helix.PropertyKey.Builder;
 import org.apache.helix.PropertyPathConfig;
@@ -63,18 +63,16 @@ import org.apache.helix.healthcheck.ParticipantHealthReportCollector;
 import org.apache.helix.healthcheck.ParticipantHealthReportCollectorImpl;
 import org.apache.helix.healthcheck.ParticipantHealthReportTask;
 import org.apache.helix.messaging.DefaultMessagingService;
-import org.apache.helix.model.ConfigScope;
 import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
 import org.apache.helix.model.LiveInstance;
-import org.apache.helix.model.builder.ConfigScopeBuilder;
 import org.apache.helix.monitoring.ZKPathDataDumpTask;
 import org.apache.helix.participant.HelixStateMachineEngine;
 import org.apache.helix.participant.StateMachineEngine;
 import org.apache.helix.store.zk.AutoFallbackPropertyStore;
 import org.apache.helix.store.zk.ZkHelixPropertyStore;
 import org.apache.log4j.Logger;
-import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.Watcher.Event.EventType;
+import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooKeeper.States;
 
 public class ZKHelixManager implements HelixManager, IZkStateListener {
@@ -146,9 +144,9 @@ public class ZKHelixManager implements HelixManager, IZkStateListener {
 
     @Override
     public void start() {
-      long initialDelay = 30 * 60 * 1000;
-      long period = 120 * 60 * 1000;
-      int timeThresholdNoChange = 180 * 60 * 1000;
+      long initialDelay = 0;
+      long period = 15 * 60 * 1000;
+      int timeThresholdNoChange = 15 * 60 * 1000;
 
       if (_timer == null) {
         LOG.info("Start StatusDumpTask");