(solr) branch branch_9x updated: SOLR-11191: fix SplitShardTest.testWithChildDocuments The delete parent shard trick wasn't reliable; parent may still be active. So use activeClusterShape based on the 9x definition; differs from 10x

[dsmiley]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new b0ceb052051 SOLR-11191: fix SplitShardTest.testWithChildDocuments The 
delete parent shard trick wasn't reliable; parent may still be active. So use 
activeClusterShape based on the 9x definition; differs from 10x
b0ceb052051 is described below

commit b0ceb052051e53b81ecbd598990f944ff0e370a2
Author: David Smiley <dsmi...@apache.org>
AuthorDate: Thu Oct 31 09:53:49 2024 -0400

    SOLR-11191: fix SplitShardTest.testWithChildDocuments
    The delete parent shard trick wasn't reliable; parent may still be active.
    So use activeClusterShape based on the 9x definition; differs from 10x
---
 solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java 
b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
index e69c9a08529..d93a7c0da8a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
@@ -192,9 +192,9 @@ public class SplitShardTest extends SolrCloudTestCase {
             .setShardName("shard1");
     splitShard.setWaitForFinalState(true);
     splitShard.process(solrClient);
-    CollectionAdminRequest.deleteShard(COLLECTION_NAME, 
"shard1").process(solrClient);
+
     waitForState(
-        "Waiting for 2 active shards after split", COLLECTION_NAME, 
activeClusterShape(2, 2));
+        "Waiting for 2 active shards after split", COLLECTION_NAME, 
activeClusterShape(2, 3));
 
     QueryRequest req =
         new QueryRequest(new SolrQuery("type_s:parent").setFields("*", 
"[child]", "[shard]"));