You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2019/09/06 11:54:02 UTC
[lucene-solr] branch master updated: SOLR-13240: Fixed UTILIZENODE
action resulting in IllegalArgumentException. (Hendrik Haddorp,
Richard Goodman, Tim Owen, shalin, noble, Christine Poerschke)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 6574ae6 SOLR-13240: Fixed UTILIZENODE action resulting in IllegalArgumentException. (Hendrik Haddorp, Richard Goodman, Tim Owen, shalin, noble, Christine Poerschke)
6574ae6 is described below
commit 6574ae63d43f1a5a60c126a6d766d242883bf806
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Sep 6 12:36:33 2019 +0100
SOLR-13240: Fixed UTILIZENODE action resulting in IllegalArgumentException.
(Hendrik Haddorp, Richard Goodman, Tim Owen, shalin, noble, Christine Poerschke)
---
solr/CHANGES.txt | 3 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 9 +-
.../autoscaling/MoveReplicaSuggesterTest.java | 104 +++++++++++++++++++++
.../client/solrj/cloud/autoscaling/TestPolicy.java | 12 ++-
4 files changed, 121 insertions(+), 7 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6dbdc78..59da606 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -197,6 +197,9 @@ Bug Fixes
* SOLR-13717: Fixed distributed grouping when multiple 'fl' params are specified (hossman, Christine Poerschke)
+* SOLR-13240: Fixed UTILIZENODE action resulting in IllegalArgumentException.
+ (Hendrik Haddorp, Richard Goodman, Tim Owen, shalin, noble, Christine Poerschke)
+
Other Changes
----------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
index d68f558..45f18b1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
@@ -96,9 +96,12 @@ public class MoveReplicaSuggester extends Suggester {
}
static Comparator<Pair<ReplicaInfo, Row>> leaderLast = (r1, r2) -> {
- if (r1.first().isLeader) return 1;
- if (r2.first().isLeader) return -1;
- return 0;
+ int leaderCompare = Boolean.compare(r1.first().isLeader, r2.first().isLeader);
+ if ( leaderCompare != 0 ) {
+ return leaderCompare;
+ } else {
+ return r1.first().getName().compareTo(r2.first().getName());
+ }
};
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggesterTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggesterTest.java
new file mode 100644
index 0000000..5bea6ac
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggesterTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.client.solrj.cloud.autoscaling;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.Pair;
+import org.junit.Test;
+
+import static org.apache.solr.client.solrj.cloud.autoscaling.MoveReplicaSuggester.leaderLast;
+
+public class MoveReplicaSuggesterTest extends SolrTestCaseJ4 {
+ private String CORE = "collection_shard1_replica_n1";
+ private String COLLECTION = "collection";
+ private String SHARD = "shard1";
+ private Map<String, Object> IS_LEADER = Collections.singletonMap(ZkStateReader.LEADER_PROP, true);
+ private String NODE = "127.0.0.1:8080_solr";
+ private Replica.Type REPLICA_TYPE = Replica.Type.NRT;
+ private Row ROW = null;
+
+ private ReplicaInfo REPLICA_INFO_ONE = new ReplicaInfo("core_node1", CORE, COLLECTION, SHARD, REPLICA_TYPE, NODE, IS_LEADER);
+ private ReplicaInfo REPLICA_INFO_TWO = new ReplicaInfo("core_node2", CORE, COLLECTION, SHARD, REPLICA_TYPE, NODE, null);
+ private ReplicaInfo REPLICA_INFO_THREE = new ReplicaInfo("core_node3", CORE, COLLECTION, SHARD, REPLICA_TYPE, NODE, IS_LEADER);
+ private ReplicaInfo REPLICA_INFO_FOUR = new ReplicaInfo("core_node4", CORE, COLLECTION, SHARD, REPLICA_TYPE, NODE, null);
+
+ private Pair<ReplicaInfo, Row> PAIR_ONE = new Pair<>(REPLICA_INFO_ONE, ROW);
+ private Pair<ReplicaInfo, Row> PAIR_TWO = new Pair<>(REPLICA_INFO_TWO, ROW);
+ private Pair<ReplicaInfo, Row> PAIR_THREE = new Pair<>(REPLICA_INFO_THREE, ROW);
+ private Pair<ReplicaInfo, Row> PAIR_FOUR = new Pair<>(REPLICA_INFO_FOUR, ROW);
+
+ @Test
+ public void assertLeaderProperties() {
+ assertTrue(REPLICA_INFO_ONE.isLeader);
+ assertFalse(REPLICA_INFO_TWO.isLeader);
+ assertTrue(REPLICA_INFO_THREE.isLeader);
+ assertFalse(REPLICA_INFO_FOUR.isLeader);
+ }
+
+ @Test
+ public void sortReplicasValidate() {
+ List<Pair<ReplicaInfo, Row>> validReplicas = new ArrayList<Pair<ReplicaInfo, Row>>() {
+ {
+ add(PAIR_ONE);
+ add(PAIR_FOUR);
+ add(PAIR_TWO);
+ }
+ };
+ if (random().nextBoolean()) {
+ Collections.shuffle(validReplicas, random());
+ }
+ validReplicas.sort(leaderLast);
+
+ assertFalse(isReplicaLeader(validReplicas, 0));
+ assertFalse(isReplicaLeader(validReplicas, 1));
+ assertTrue(isReplicaLeader(validReplicas, 2));
+ }
+
+ @Test
+ public void sortReplicasValidateLeadersMultipleLeadersComeLast() {
+ List<Pair<ReplicaInfo, Row>> validReplicas = new ArrayList<Pair<ReplicaInfo, Row>>() {
+ {
+ add(PAIR_THREE);
+ add(PAIR_ONE);
+ add(PAIR_FOUR);
+ add(PAIR_TWO);
+ }
+ };
+ if (random().nextBoolean()) {
+ Collections.shuffle(validReplicas, random());
+ }
+ validReplicas.sort(leaderLast);
+
+ assertFalse(isReplicaLeader(validReplicas, 0));
+ assertFalse(isReplicaLeader(validReplicas, 1));
+ assertTrue(isReplicaLeader(validReplicas, 2));
+ assertTrue(isReplicaLeader(validReplicas, 3));
+ }
+
+ private boolean isReplicaLeader(List<Pair<ReplicaInfo, Row>> replicas, int index) {
+ return replicas.get(index).first().isLeader;
+ }
+
+}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
index 53250c0..921c2cb 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
@@ -1081,7 +1081,7 @@ public class TestPolicy extends SolrTestCaseJ4 {
config = new AutoScalingConfig(policies);
policy = config.getPolicy();
session = null;
- for (String expectedReplica : new String[] { "r3", "r5", "r1", null }) {
+ for (String expectedReplica : new String[] { "r1", "r3", "r5", null }) {
if (session == null) {
session = policy.createSession(provider);
} else {
@@ -1129,8 +1129,8 @@ public class TestPolicy extends SolrTestCaseJ4 {
policy = config.getPolicy();
session = null;
- final String[] expectedReplica = new String[] { "r3", "r5", "r1" };
- final String[] expectedTargetNode = new String[] { "node2", "node2", "node3" };
+ final String[] expectedReplica = new String[] { "r1", "r3", "r5" };
+ final String[] expectedTargetNode = new String[] { "node3", "node3", "node2" };
for (int ii = 0; ii < expectedReplica.length; ++ii) {
if (session == null) {
session = policy.createSession(provider);
@@ -2249,7 +2249,11 @@ public class TestPolicy extends SolrTestCaseJ4 {
assertEquals("/c/mycoll1", l.get(0)._get( "operation/path",null));
assertNotNull(l.get(0)._get("operation/command/move-replica", null));
assertEquals("10.0.0.6:7574_solr", l.get(0)._get( "operation/command/move-replica/targetNode",null));
- assertEquals("core_node2", l.get(0)._get("operation/command/move-replica/replica", null));
+ /*
+ * one of the two cores on 10.0.0.6:8983_solr should move to 10.0.0.6:7574_solr and
+ * (everything else being equal) core_node1 is chosen ahead of core_node2 based on its name
+ */
+ assertEquals("core_node1", l.get(0)._get("operation/command/move-replica/replica", null));
}