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 2018/10/03 11:29:27 UTC
lucene-solr:branch_7x: SOLR-12648: Use the information whether custom
preferences were specified in the CloudUtil.usePolicyFramework method instead
of comparing directly against default preferences. Comparing against default
preferences was wrong because
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 5d3ceed43 -> c576a9bca
SOLR-12648: Use the information whether custom preferences were specified in the CloudUtil.usePolicyFramework method instead of comparing directly against default preferences. Comparing against default preferences was wrong because it ignores the case where the user explicitly added the same preferences as the default ones.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c576a9bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c576a9bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c576a9bc
Branch: refs/heads/branch_7x
Commit: c576a9bca03c46110923c2b6c2ea3b4385634b7f
Parents: 5d3ceed
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Oct 3 16:58:45 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Oct 3 16:59:13 2018 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/cloud/CloudUtil.java | 2 +-
.../apache/solr/client/solrj/cloud/autoscaling/Policy.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c576a9bc/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 26ba1b8..f4a92d1 100644
--- a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
+++ b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java
@@ -174,7 +174,7 @@ public class CloudUtil {
// if no autoscaling configuration exists then obviously we cannot use the policy framework
if (autoScalingConfig.getPolicy().isEmpty()) return false;
// do custom preferences exist
- if (!autoScalingConfig.getPolicy().getClusterPreferences().equals(Policy.DEFAULT_PREFERENCES)) return true;
+ if (!autoScalingConfig.getPolicy().isEmptyPreferences()) return true;
// does a cluster policy exist
if (!autoScalingConfig.getPolicy().getClusterPolicy().isEmpty()) return true;
// finally we check if the current collection has a policy
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c576a9bc/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
index 78043df..cfe9455 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
@@ -478,6 +478,13 @@ public class Policy implements MapWriter {
return empty;
}
+ /**
+ * @return true if no preferences were specified by the user, false otherwise
+ */
+ public boolean isEmptyPreferences() {
+ return emptyPreferences;
+ }
+
/*This stores the logical state of the system, given a policy and
* a cluster state.
*