Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11871: MoveReplicaSuggester should not suggest leader if other replicas are available

This commit is contained in:
Noble Paul 2018-01-23 00:12:51 +11:00
parent f72a5dbdc8
commit 876ecd87fb
5 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -163,6 +163,8 @@ Other Changes
* SOLR-11747: Pause triggers until actions finish executing and the cool down period expires. (shalin)
* SOLR-11871: MoveReplicaSuggester should not suggest leader if other replicas are available (noble)
================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

10
solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
View File

@ -18,6 +18,7 @@
package org.apache.solr.client.solrj.cloud.autoscaling;
import java.io.IOException;
import java.util.Comparator;
import java.util.List;
import org.apache.solr.client.solrj.SolrRequest;
@ -40,7 +41,9 @@ public class MoveReplicaSuggester extends Suggester {
Integer targetNodeIndex = null;
Integer sourceNodeIndex = null;
ReplicaInfo sourceReplicaInfo = null;
for (Pair<ReplicaInfo, Row> fromReplica : getValidReplicas(true, true, -1)) {
List<Pair<ReplicaInfo, Row>> validReplicas = getValidReplicas(true, true, -1);
validReplicas.sort(leaderLast);
for (Pair<ReplicaInfo, Row> fromReplica : validReplicas) {
Row fromRow = fromReplica.second();
ReplicaInfo replicaInfo = fromReplica.first();
String coll = replicaInfo.getCollection();
@ -79,6 +82,11 @@ public class MoveReplicaSuggester extends Suggester {
}
return null;
}
static Comparator<Pair<ReplicaInfo, Row>> leaderLast = (r1, r2) -> {
if (r1.first().isLeader) return 1;
if (r2.first().isLeader) return -1;
return 0;
};
@Override

7
solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
View File

@ -18,6 +18,7 @@
package org.apache.solr.client.solrj.cloud.autoscaling;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@ -27,6 +28,8 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.Utils;
import static org.apache.solr.common.cloud.ZkStateReader.LEADER_PROP;
public class ReplicaInfo implements MapWriter {
// private final Replica replica;
@ -34,6 +37,7 @@ public class ReplicaInfo implements MapWriter {
private String core, collection, shard;
private Replica.Type type;
private String node;
public final boolean isLeader;
private final Map<String, Object> variables = new HashMap<>();
public ReplicaInfo(String coll, String shard, Replica r, Map<String, Object> vals) {
@ -42,6 +46,7 @@ public class ReplicaInfo implements MapWriter {
this.collection = coll;
this.shard = shard;
this.type = r.getType();
this.isLeader = r.getBool(LEADER_PROP, false);
if (vals != null) {
this.variables.putAll(vals);
}
@ -49,10 +54,12 @@ public class ReplicaInfo implements MapWriter {
}
public ReplicaInfo(String name, String core, String coll, String shard, Replica.Type type, String node, Map<String, Object> vals) {
if(vals==null) vals = Collections.emptyMap();
this.name = name;
if (vals != null) {
this.variables.putAll(vals);
}
this.isLeader = "true".equals(String.valueOf(vals.getOrDefault(LEADER_PROP, "false")));
this.collection = coll;
this.shard = shard;
this.type = type;

11
solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
View File

@ -16,15 +16,15 @@
*/
package org.apache.solr.common.cloud;
import org.apache.solr.common.util.Utils;
import org.noggit.JSONUtil;
import org.noggit.JSONWriter;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.apache.solr.common.util.Utils;
import org.noggit.JSONUtil;
import org.noggit.JSONWriter;
/**
* ZkNodeProps contains generic immutable properties.
*/
@ -148,7 +148,8 @@ public class ZkNodeProps implements JSONWriter.Writable {
public boolean getBool(String key, boolean b) {
Object o = propMap.get(key);
if(o==null) return b;
if (o == null) return b;
if (o instanceof Boolean) return (boolean) o;
return Boolean.parseBoolean(o.toString());
}

27
solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
View File

@ -1744,5 +1744,32 @@ public class TestPolicy extends SolrTestCaseJ4 {
cloudManager, null, Arrays.asList("shard1", "shard2"), 1, 0, 0, null);
assertTrue(locations.stream().allMatch(it -> "node3".equals(it.node)));
}
public void testMoveReplicaLeaderlast(){
List<Pair<ReplicaInfo, Row>> validReplicas = new ArrayList<>();
Replica replica = new Replica("r1", Utils.makeMap("leader", "true"));
ReplicaInfo replicaInfo = new ReplicaInfo("c1", "s1", replica, new HashMap<>());
validReplicas.add(new Pair<>(replicaInfo, null));
replicaInfo = new ReplicaInfo("r4", "c1_s2_r1","c1", "s2", Replica.Type.NRT, "n1", Collections.singletonMap("leader", "true"));
validReplicas.add(new Pair<>(replicaInfo, null));
replica = new Replica("r2", Utils.makeMap("leader", false));
replicaInfo = new ReplicaInfo("c1", "s1", replica, new HashMap<>());
validReplicas.add(new Pair<>(replicaInfo, null));
replica = new Replica("r3", Utils.makeMap("leader", false));
replicaInfo = new ReplicaInfo("c1", "s1", replica, new HashMap<>());
validReplicas.add(new Pair<>(replicaInfo, null));
validReplicas.sort(MoveReplicaSuggester.leaderLast);
assertEquals("r2", validReplicas.get(0).first().getName());
assertEquals("r3", validReplicas.get(1).first().getName());
assertEquals("r1", validReplicas.get(2).first().getName());
assertEquals("r4", validReplicas.get(3).first().getName());
}
}