This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit f271f86c68c545db9bdc4ef7b158abcc8a53cc58 Author: David Smiley <[email protected]> AuthorDate: Mon Jun 22 22:07:07 2026 -0400 SOLR-18188: Fix ForceLeaderTest Inaccurately ported CloudSolrClient settings. Also confused zkServer.getZkAddress() & getZkHost() (cherry picked from commit b3a721bb836d7b72b020e35b29178dd0c3b2b42a) --- solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java index d9758361901..ba6efab0c3e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java @@ -193,9 +193,12 @@ public class ForceLeaderTest extends HttpPartitionTest { @Override protected CloudSolrClient createCloudClient(String defaultCollection) { - boolean shardLeadersOnly = false; // this test requires we use any replica - return createNewCloudSolrClient( - zkServer.getZkHost(), TEST_COLLECTION, shardLeadersOnly, 30_000, 120_000); + // Use non-randomized builder; this test requires deterministic routing: + // shardLeadersOnly=true (default), directUpdatesToLeadersOnly=false. + return new CloudSolrClient.Builder(zkServer.getZkAddress()) + .withDefaultCollection(defaultCollection) + .sendDirectUpdatesToAnyShardReplica() + .build(); } private void putNonLeadersIntoLowerTerm( @@ -312,7 +315,7 @@ public class ForceLeaderTest extends HttpPartitionTest { CollectionAdminRequest.forceLeaderElection(collectionName, shard); try (var cloudClient = - createNewCloudSolrClient(zkServer.getZkHost(), null, true, 3_000, 60_000)) { + createNewCloudSolrClient(zkServer.getZkAddress(), null, true, 3_000, 60_000)) { cloudClient.request(forceLeader); } }
