You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/05/15 08:36:00 UTC
lucene-solr:feature/autoscaling: Use correct znode path for
autoscaling configuration
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling 65744aa5d -> 5d7069bd5
Use correct znode path for autoscaling configuration
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d7069bd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d7069bd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d7069bd
Branch: refs/heads/feature/autoscaling
Commit: 5d7069bd52c7b57d9b9ba971d7709d4b59ebdecf
Parents: 65744aa
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon May 15 14:05:53 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon May 15 14:05:53 2017 +0530
----------------------------------------------------------------------
.../org/apache/solr/cloud/OverseerCollectionMessageHandler.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d7069bd/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index 7338c05..85e2baa 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -100,7 +100,6 @@ import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.SOLR_AUTOSCALING_CONF_PATH;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;
import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
-import static org.apache.solr.common.params.CommonParams.AUTOSCALING_PATH;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.common.util.Utils.makeMap;
@@ -711,7 +710,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
List<String> shardNames,
int repFactor) throws IOException, KeeperException, InterruptedException {
List<Map> rulesMap = (List) message.get("rule");
- Map m = zkStateReader.getZkClient().getJson(AUTOSCALING_PATH, true);
+ Map m = zkStateReader.getZkClient().getJson(ZkStateReader.SOLR_AUTOSCALING_CONF_PATH, true);
boolean useAutoScalingPolicy = false;
String policyName = message.getStr("policy");
if (rulesMap != null && (m.get(Policy.CLUSTER_POLICY) == null || m.get(Policy.CLUSTER_PREFERENCE) != null || policyName == null)) {