Apache Solr open-source search software
SOLR-18277: ShardSplitTest.testSplitAfterFailedSplit AwaitsFix
David Smileya8bcd4a7b1eb
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.javaindex 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;+@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);