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 2b10f1ef98d726fbd9d3777f3c8e4e29003b9acb Author: David Smiley <[email protected]> AuthorDate: Sun May 31 23:37:36 2026 -0400 SOLR-18277: ShardSplitTest.testSplitAfterFailedSplit AwaitsFix (cherry picked from commit a8bcd4a7b1ebbc459c0a0ef56f535c9c069514a9) --- .../org/apache/solr/cloud/api/collections/ShardSplitTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java index 7fdf13328d1..a96e0573dd6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java @@ -16,6 +16,7 @@ */ package org.apache.solr.cloud.api.collections; +import static org.apache.lucene.tests.util.LuceneTestCase.Nightly; import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR; import java.io.IOException; @@ -36,7 +37,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.apache.lucene.tests.util.LuceneTestCase; import org.apache.solr.client.solrj.RemoteSolrException; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServerException; @@ -77,7 +77,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; [email protected] +@Nightly @LogLevel( "org.apache.solr.cloud.Overseer=DEBUG;org.apache.solr.cloud.overseer=DEBUG;org.apache.solr.cloud.api.collections=DEBUG;org.apache.solr.cloud.OverseerTaskProcessor=DEBUG;org.apache.solr.util.TestInjection=DEBUG") public class ShardSplitTest extends BasicDistributedZkTest { @@ -337,6 +337,7 @@ public class ShardSplitTest extends BasicDistributedZkTest { * <p>See SOLR-9439 */ @Test + @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-18277";) public void testSplitAfterFailedSplit() throws Exception { waitForThingsToLevelOut(15, TimeUnit.SECONDS); @@ -349,7 +350,8 @@ public class ShardSplitTest extends BasicDistributedZkTest { } } - private void splitAfterFailedSplit() throws KeeperException, InterruptedException { + private void splitAfterFailedSplit() + throws KeeperException, InterruptedException, TimeoutException { try { CollectionAdminRequest.SplitShard splitShard = CollectionAdminRequest.splitShard(AbstractFullDistribZkTestBase.DEFAULT_COLLECTION); @@ -391,6 +393,7 @@ public class ShardSplitTest extends BasicDistributedZkTest { @Test @Nightly + @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-18277";) public void testSplitAfterFailedSplit2() throws Exception { waitForThingsToLevelOut(15, TimeUnit.SECONDS);
