helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] helix git commit: Disable ResourceMonitor for jobs
Date Mon, 11 Sep 2017 05:56:48 GMT
Disable ResourceMonitor for jobs


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

Branch: refs/heads/master
Commit: 78ed261e7afea59c4898ec28caa77f0569e3b5f2
Parents: 361fdc9
Author: Junkai Xue <jxue@linkedin.com>
Authored: Fri Aug 25 12:27:58 2017 -0700
Committer: Junkai Xue <jxue@linkedin.com>
Committed: Fri Aug 25 12:27:58 2017 -0700

----------------------------------------------------------------------
 .../org/apache/helix/controller/stages/ClusterDataCache.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/78ed261e/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
index 89d483b..93555cd 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/ClusterDataCache.java
@@ -101,12 +101,14 @@ public class ClusterDataCache {
       _idealStateCacheMap = accessor.getChildValuesMap(keyBuilder.idealStates());
       _liveInstanceCacheMap = accessor.getChildValuesMap(keyBuilder.liveInstances());
       _instanceConfigCacheMap = accessor.getChildValuesMap(keyBuilder.instanceConfigs());
-      _resourceConfigCacheMap = accessor.getChildValuesMap(keyBuilder.resourceConfigs());
     }
     _idealStateMap = Maps.newHashMap(_idealStateCacheMap);
     _liveInstanceMap = Maps.newHashMap(_liveInstanceCacheMap);
     _instanceConfigMap = Maps.newHashMap(_instanceConfigCacheMap);
-    _resourceConfigMap = Maps.newHashMap(_resourceConfigCacheMap);
+
+    // TODO: We should listen on resource config change instead of fetching every time
+    //       And add back resourceConfigCacheMap
+    _resourceConfigMap = accessor.getChildValuesMap(keyBuilder.resourceConfigs());
 
     _stateModelDefMap = accessor.getChildValuesMap(keyBuilder.stateModelDefs());
     _constraintMap = accessor.getChildValuesMap(keyBuilder.constraints());


Mime
View raw message