Apache Solr open-source search software
SOLR-17837: Omit PULL replicas from preferredLeader prop distribution (#3451)
Kevin Liangb69f698b3c5c
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 0e8bf284cee..08a780c7677 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -265,6 +265,8 @@ Bug Fixes* SOLR-17863: Fix race condition in SolrCore's fingerprint cache which caused leader election to hang. (Luke Kot-Zaniewski, Matthew Biscocho)+* SOLR-17837: PULL replica nodes could be marked as "preferredLeader" by BALANCESHARDUNIQUE despite never being able to be elected leader (Kevin Liang via Houston Putman)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/cloud/ExclusiveSliceProperty.java b/solr/core/src/java/org/apache/solr/cloud/ExclusiveSliceProperty.javaindex 20a71e8da38..033ba51da45 100644--- a/solr/core/src/java/org/apache/solr/cloud/ExclusiveSliceProperty.java+++ b/solr/core/src/java/org/apache/solr/cloud/ExclusiveSliceProperty.java@@ -151,6 +151,12 @@ class ExclusiveSliceProperty {}continue;}+ // omit replicas that cannot potentially be leader from preferredLeader+ // candidates+ if (SliceMutator.PREFERRED_LEADER_PROP.equals(property)+ && !replica.getType().leaderEligible) {+ continue;+ }allHosts.add(replica.getNodeName());String nodeName = replica.getNodeName();if (StrUtils.isNotBlank(replica.getStr(property))) {diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.javaindex ca2d3f3c8d7..b2149c9825e 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestReplicaProperties.java@@ -36,7 +36,6 @@ import org.apache.solr.common.util.NamedList;import org.junit.Test;public class TestReplicaProperties extends ReplicaPropertiesBase {-public static final String COLLECTION_NAME = "testcollection";public TestReplicaProperties() {@@ -49,11 +48,11 @@ public class TestReplicaProperties extends ReplicaPropertiesBase {public void test() throws Exception {try (CloudSolrClient client = createCloudClient(null)) {- // Mix up a bunch of different combinations of shards and replicas in order to exercise- // boundary cases. shards, replicationFactor- int shards = random().nextInt(5) + 2;- int replicationFactor = random().nextInt(2) + 2;- createCollection(null, COLLECTION_NAME, shards, replicationFactor, client, null, "conf1");+ int shards = 5;+ int tlogNodes = 4;+ int pullNodes = 4;+ Map<String, Object> replicaProps = createReplicaProps(0, tlogNodes, pullNodes, shards);+ createCollection(null, COLLECTION_NAME, replicaProps, client, "conf1");}waitForCollection(ZkStateReader.from(cloudClient), COLLECTION_NAME, 2);@@ -249,6 +248,14 @@ public class TestReplicaProperties extends ReplicaPropertiesBase {for (Replica replica : slice.getReplicas()) {boolean isLeader = replica.getBool("leader", false);boolean isPreferred = replica.getBool("property.preferredleader", false);+ if (!replica.getType().leaderEligible && isPreferred) {+ lastFailMsg =+ "Replica "+ + replica.getName()+ + " of type "+ + replica.getType()+ + ", that cannot be elected leader, should NOT be marked as a preferred leader";+ }if (isLeader != isPreferred) {lastFailMsg ="Replica should NOT have preferredLeader != leader. Preferred: "diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex 767847ff701..92ff503ba85 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -2359,17 +2359,25 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTesfail("Could not find the new collection - " + exp.code() + " : " + baseUrl);}+ // for bypassing getPullReplicaCount() - idk why setting pulla replica # should be determined at+ // class level and+ // can cause weird behavior+ protected static Map<String, Object> createReplicaProps(+ int numNrtReplicas, int numTlogReplicas, int numPullReplicas, int numShards) {+ return Map.of(+ ZkStateReader.NRT_REPLICAS, numNrtReplicas,+ ZkStateReader.TLOG_REPLICAS, numTlogReplicas,+ ZkStateReader.PULL_REPLICAS, numPullReplicas,+ CollectionHandlingUtils.NUM_SLICES, numShards);+ }+protected void createCollection(String collName, CloudSolrClient client, int replicationFactor, int numShards)throws Exception {int numNrtReplicas = useTlogReplicas() ? 0 : replicationFactor;int numTlogReplicas = useTlogReplicas() ? replicationFactor : 0;Map<String, Object> props =- Map.of(- ZkStateReader.NRT_REPLICAS, numNrtReplicas,- ZkStateReader.TLOG_REPLICAS, numTlogReplicas,- ZkStateReader.PULL_REPLICAS, getPullReplicaCount(),- CollectionHandlingUtils.NUM_SLICES, numShards);+ createReplicaProps(numNrtReplicas, numTlogReplicas, getPullReplicaCount(), numShards);Map<String, List<Integer>> collectionInfos = new HashMap<>();createCollection(collectionInfos, collName, props, client);}