You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/09/26 11:50:16 UTC
[45/45] lucene-solr:jira/solr-12709: Fix merge errors.
Fix merge errors.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/359829fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/359829fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/359829fb
Branch: refs/heads/jira/solr-12709
Commit: 359829fbfac9275cdfcf3565a141d7196af5a128
Parents: 7c847c3
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Sep 26 13:49:07 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Sep 26 13:49:07 2018 +0200
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/CloudUtil.java | 4 ++--
.../src/java/org/apache/solr/cloud/api/collections/Assign.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/359829fb/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
index 55231f8..13734f6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
@@ -144,9 +144,9 @@ public class CloudUtil {
}
- public static boolean usePolicyFramework(String collection, SolrCloudManager cloudManager)
+ public static boolean usePolicyFramework(DocCollection collection, SolrCloudManager cloudManager)
throws IOException, InterruptedException {
AutoScalingConfig autoScalingConfig = cloudManager.getDistribStateManager().getAutoScalingConfig();
- return !autoScalingConfig.getPolicy().isEmpty();
+ return !autoScalingConfig.getPolicy().getClusterPolicy().isEmpty() || collection.getPolicyName() != null;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/359829fb/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index 47d1ee4..9b33f52 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@ -39,7 +39,6 @@ import org.apache.solr.client.solrj.cloud.autoscaling.AutoScalingConfig;
import org.apache.solr.client.solrj.cloud.autoscaling.BadVersionException;
import org.apache.solr.client.solrj.cloud.autoscaling.PolicyHelper;
import org.apache.solr.client.solrj.cloud.autoscaling.VersionedData;
-import org.apache.solr.cloud.CloudUtil;
import org.apache.solr.cloud.rule.ReplicaAssigner;
import org.apache.solr.cloud.rule.Rule;
import org.apache.solr.common.SolrException;
@@ -257,7 +256,7 @@ public class Assign {
String policyName = message.getStr(POLICY);
AutoScalingConfig autoScalingConfig = cloudManager.getDistribStateManager().getAutoScalingConfig();
- if (rulesMap == null && !CloudUtil.usePolicyFramework(collectionName, cloudManager)) {
+ if (rulesMap == null && policyName == null && autoScalingConfig.getPolicy().getClusterPolicy().isEmpty()) {
log.debug("Identify nodes using default");
int i = 0;
List<ReplicaPosition> result = new ArrayList<>();