You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/28 15:58:31 UTC
[lucene-solr] 01/02: @1051 Test hardening.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 11993cb0f445621556f29ae8a30d83868c2da92c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Oct 27 13:34:55 2020 -0500
@1051 Test hardening.
---
solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java | 3 ++-
solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java | 4 ++--
.../org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java | 2 ++
.../cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 2 +-
.../test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java | 4 ++--
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
index 49fee86..2581b9b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
@@ -43,7 +43,8 @@ public class RemoteQueryErrorTest extends SolrCloudTestCase {
@Test
public void test() throws Exception {
- CollectionAdminRequest.createCollection("collection", "conf", 2, 1).process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection("collection", "conf", 2, 1).
+ setMaxShardsPerNode(100).process(cluster.getSolrClient());
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
try (SolrClient client = jetty.newClient()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
index 92f018e..6c9148d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -260,7 +260,7 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
public HttpSolrClient getClient(String collection, int i) {
String baseUrl = cluster.getJettySolrRunner(i).getBaseUrl().toString() + "/" + collection;
HttpSolrClient client = new HttpSolrClient.Builder(baseUrl)
- .withConnectionTimeout(15)
+ .withConnectionTimeout(15000)
.withSocketTimeout(Integer.getInteger("socketTimeout", 30000))
.build();
newClients.add(client);
@@ -270,7 +270,7 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
public HttpSolrClient getClient(String collection, String url) {
String baseUrl = url + "/" + collection;
HttpSolrClient client = new HttpSolrClient.Builder(baseUrl)
- .withConnectionTimeout(15)
+ .withConnectionTimeout(15000)
.withSocketTimeout(Integer.getInteger("socketTimeout", 30000))
.build();
newClients.add(client);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
index bf55f17..4e009d5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java
@@ -124,6 +124,8 @@ public class TestTolerantUpdateProcessorRandomCloud extends SolrCloudTestCase {
@Before
private void deleteAllDocs() throws Exception {
assertEquals(0, update(params("commit","true")).deleteByQuery("*:*").process(CLOUD_CLIENT).getStatus());
+
+ // TODO: this can rarely randomly fail, whats the race?
assertEquals("index should be empty", 0L, countDocs(CLOUD_CLIENT));
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
index c878b09..c7d3f6e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java
@@ -283,7 +283,7 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
int numShards = TestUtil.nextInt(random(), 0, cluster.getJettySolrRunners().size()) + 1;
int replicationFactor = TestUtil.nextInt(random(), 0, 3) + 1;
- int maxShardsPerNode = (((numShards * replicationFactor) / cluster.getJettySolrRunners().size())) + 1;
+ int maxShardsPerNode = 100;
createRequests[i]
= CollectionAdminRequest.createCollection("awhollynewcollection_" + i, "conf2", numShards, replicationFactor)
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
index 8e7caa0..d4e7b13 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java
@@ -251,7 +251,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
splitShard.setAsyncId("SPLIT4");
}
splitShard.process(client);
- cluster.waitForActiveCollection(COLLECTION_NAME, 4, 5);
+ cluster.waitForActiveCollection(COLLECTION_NAME, 5, 5);
collection = client.getZkStateReader().getClusterState().getCollection(COLLECTION_NAME);
slices1 = collection.getRouter().getSearchSlicesSingle(uniquePrefixes.get(0).key, null, collection);
@@ -269,7 +269,7 @@ public class SplitByPrefixTest extends SolrCloudTestCase {
splitShard.setAsyncId("SPLIT5");
}
splitShard.process(client);
- cluster.waitForActiveCollection(COLLECTION_NAME, 6, 5);
+ cluster.waitForActiveCollection(COLLECTION_NAME, 5, 6);
collection = client.getZkStateReader().getClusterState().getCollection(COLLECTION_NAME);
slices1 = collection.getRouter().getSearchSlicesSingle(uniquePrefixes.get(0).key, null, collection);