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/29 15:47:13 UTC
[lucene-solr] branch reference_impl_dev updated: @1071 Harden.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 2331899 @1071 Harden.
2331899 is described below
commit 2331899afe7deb42a35d8de9b3c206686f0c34ca
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 29 10:46:49 2020 -0500
@1071 Harden.
---
solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java | 11 +++++++++--
solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java | 4 +++-
.../solr/handler/component/CustomHighlightComponentTest.java | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index bf50c45..bb5e56f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@ -158,9 +158,16 @@ public class MoveReplicaTest extends SolrCloudTestCase {
// wait for recovery
cluster.waitForActiveCollection(coll, 2, isTlog ? 4 : 2);
- Thread.sleep(500);
+ for (int i = 0; i < 10; i++) {
+ long cnt = cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound();
+ if (cnt < 100) {
+ Thread.sleep(100);
+ } else {
+ break;
+ }
+ }
- assertEquals(100, cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound());
+ assertEquals(100, cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound());
moveReplica = createMoveReplicaRequest(coll, replica, targetNode, shardId);
moveReplica.setInPlaceMove(inPlaceMove);
diff --git a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
index e50af32..869e40b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
@@ -70,7 +70,9 @@ public class SplitShardTest extends SolrCloudTestCase {
@Override
public void tearDown() throws Exception {
super.tearDown();
- cluster.deleteAllCollections();
+ // TODO: we should not do this when not needed, but why does it fail (timeout) in
+ // these kinds of tests very rarely
+ //cluster.deleteAllCollections();
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
index 0e866bc..d80588f 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/CustomHighlightComponentTest.java
@@ -123,7 +123,7 @@ public class CustomHighlightComponentTest extends SolrCloudTestCase {
CollectionAdminRequest
.createCollection(COLLECTION, "conf", numShards, numReplicas)
.setMaxShardsPerNode(maxShardsPerNode)
- .processAndWait(cluster.getSolrClient(), DEFAULT_TIMEOUT);
+ .process(cluster.getSolrClient());
}
@Test