You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/08/16 02:32:23 UTC
lucene-solr:branch_7x: SOLR-12656: ShardSplitTest should extend
AbstractFullDistribZkTestBase instead of BasicDistributedZkTest. Also removed
some unused overridden methods to create solr clients
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x d8ae28f2f -> 5cf2a57fd
SOLR-12656: ShardSplitTest should extend AbstractFullDistribZkTestBase instead of BasicDistributedZkTest. Also removed some unused overridden methods to create solr clients
(cherry picked from commit 93a20b72b1a4fe7f5726d68cce2082e04df4a02b)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5cf2a57f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5cf2a57f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5cf2a57f
Branch: refs/heads/branch_7x
Commit: 5cf2a57fd7818f6cb8f2bf40a3d5c4eb4c26c4d1
Parents: d8ae28f
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Aug 16 08:01:08 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Aug 16 08:02:17 2018 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../cloud/api/collections/ShardSplitTest.java | 23 ++------------------
2 files changed, 4 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cf2a57f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ead898d..5d4c573 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -258,6 +258,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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5cf2a57f/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
----------------------------------------------------------------------
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 a3fbd19..bcdac77 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;
- }
}