diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 599b124f880..82f8453e634 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -302,6 +302,8 @@ Other Changes * SOLR-11766: Move Streaming Expressions section in Ref Guide to be a top-level section. (Cassandra Targett) +* SOLR-12656: ShardSplitTest should extend AbstractFullDistribZkTestBase instead of BasicDistributedZkTest. (shalin) + ================== 7.4.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. 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 a3fbd19fd42..bcdac770863 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 @@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; @@ -45,7 +44,7 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.RequestStatusState; import org.apache.solr.cloud.AbstractDistribZkTestBase; -import org.apache.solr.cloud.BasicDistributedZkTest; +import org.apache.solr.cloud.AbstractFullDistribZkTestBase; import org.apache.solr.cloud.ChaosMonkey; import org.apache.solr.cloud.StoppableIndexingThread; import org.apache.solr.common.SolrDocument; @@ -76,7 +75,7 @@ import static org.apache.solr.common.cloud.ZkStateReader.REPLICATION_FACTOR; @Slow @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 { +public class ShardSplitTest extends AbstractFullDistribZkTestBase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -1105,22 +1104,4 @@ public class ShardSplitTest extends BasicDistributedZkTest { log.error("EXTRA: ID: " + found); } } - - @Override - protected SolrClient createNewSolrClient(String collection, String baseUrl) { - HttpSolrClient client = (HttpSolrClient) super.createNewSolrClient(collection, baseUrl, DEFAULT_CONNECTION_TIMEOUT, 5 * 60 * 1000); - return client; - } - - @Override - protected SolrClient createNewSolrClient(int port) { - HttpSolrClient client = (HttpSolrClient) super.createNewSolrClient(port, DEFAULT_CONNECTION_TIMEOUT, 5 * 60 * 1000); - return client; - } - - @Override - protected CloudSolrClient createCloudClient(String defaultCollection) { - CloudSolrClient client = super.createCloudClient(defaultCollection); - return client; - } }