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/07/26 17:37:48 UTC
[lucene-solr] branch reference_impl updated (4e5f003 -> 31fad69)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 4e5f003 @349 Propagate out AlreadyClosed.
new 10c512cb @350 Buff this test.
new 31fad69 @351 Remove a bunch of unnecessary calls in tests.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/org/apache/solr/cloud/AddReplicaTest.java | 2 -
.../apache/solr/cloud/AliasIntegrationTest.java | 31 ---------------
.../cloud/AssignBackwardCompatibilityTest.java | 1 -
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 45 +---------------------
.../apache/solr/cloud/CreateRoutedAliasTest.java | 3 --
.../org/apache/solr/cloud/DeleteReplicaTest.java | 18 ---------
.../org/apache/solr/cloud/DeleteShardTest.java | 3 --
.../apache/solr/cloud/LeaderTragicEventTest.java | 1 -
.../solr/cloud/LeaderVoteWaitTimeoutTest.java | 13 ++-----
.../solr/cloud/LegacyCloudClusterPropTest.java | 2 -
.../apache/solr/cloud/PeerSyncReplicationTest.java | 1 -
.../apache/solr/cloud/ReindexCollectionTest.java | 2 -
.../apache/solr/cloud/RemoteQueryErrorTest.java | 1 -
.../apache/solr/cloud/ReplaceNodeNoTargetTest.java | 1 -
.../org/apache/solr/cloud/ReplaceNodeTest.java | 2 -
.../cloud/RoutingToNodesWithPropertiesTest.java | 1 -
.../apache/solr/cloud/SolrCloudBridgeTestCase.java | 6 ---
.../test/org/apache/solr/cloud/SplitShardTest.java | 6 ---
.../solr/cloud/SystemCollectionCompatTest.java | 2 +-
.../solr/cloud/TestAuthenticationFramework.java | 1 -
.../apache/solr/cloud/TestCloudDeleteByQuery.java | 1 -
.../org/apache/solr/cloud/TestCloudRecovery.java | 9 -----
.../solr/cloud/TestCloudSearcherWarming.java | 11 ++----
.../cloud/TestLeaderElectionWithEmptyReplica.java | 6 ---
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../solr/cloud/TestPullReplicaErrorHandling.java | 2 -
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 3 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 2 -
.../apache/solr/cloud/TestRequestForwarding.java | 2 -
.../solr/cloud/TestSkipOverseerOperations.java | 3 --
.../solr/cloud/TestSolrCloudWithKerberosAlt.java | 2 -
.../TestSolrCloudWithSecureImpersonation.java | 2 -
.../solr/cloud/TestTlogReplayVsRecovery.java | 3 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 1 -
.../cloud/TestTolerantUpdateProcessorCloud.java | 7 ++--
.../test/org/apache/solr/request/TestFaceting.java | 10 ++---
36 files changed, 20 insertions(+), 188 deletions(-)
[lucene-solr] 02/02: @351 Remove a bunch of unnecessary calls in
tests.
Posted by ma...@apache.org.
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 31fad69defada673c4dea586f4cb3a29b14209e6
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 12:37:23 2020 -0500
@351 Remove a bunch of unnecessary calls in tests.
---
.../test/org/apache/solr/cloud/AddReplicaTest.java | 2 -
.../apache/solr/cloud/AliasIntegrationTest.java | 31 ---------------
.../cloud/AssignBackwardCompatibilityTest.java | 1 -
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 45 +---------------------
.../apache/solr/cloud/CreateRoutedAliasTest.java | 3 --
.../org/apache/solr/cloud/DeleteReplicaTest.java | 18 ---------
.../org/apache/solr/cloud/DeleteShardTest.java | 3 --
.../apache/solr/cloud/LeaderTragicEventTest.java | 1 -
.../solr/cloud/LeaderVoteWaitTimeoutTest.java | 13 ++-----
.../solr/cloud/LegacyCloudClusterPropTest.java | 2 -
.../apache/solr/cloud/PeerSyncReplicationTest.java | 1 -
.../apache/solr/cloud/ReindexCollectionTest.java | 2 -
.../apache/solr/cloud/RemoteQueryErrorTest.java | 1 -
.../apache/solr/cloud/ReplaceNodeNoTargetTest.java | 1 -
.../org/apache/solr/cloud/ReplaceNodeTest.java | 2 -
.../cloud/RoutingToNodesWithPropertiesTest.java | 1 -
.../apache/solr/cloud/SolrCloudBridgeTestCase.java | 6 ---
.../test/org/apache/solr/cloud/SplitShardTest.java | 6 ---
.../solr/cloud/SystemCollectionCompatTest.java | 2 +-
.../solr/cloud/TestAuthenticationFramework.java | 1 -
.../apache/solr/cloud/TestCloudDeleteByQuery.java | 1 -
.../org/apache/solr/cloud/TestCloudRecovery.java | 9 -----
.../solr/cloud/TestCloudSearcherWarming.java | 11 ++----
.../cloud/TestLeaderElectionWithEmptyReplica.java | 6 ---
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 +-
.../solr/cloud/TestPullReplicaErrorHandling.java | 2 -
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 3 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 2 -
.../apache/solr/cloud/TestRequestForwarding.java | 2 -
.../solr/cloud/TestSkipOverseerOperations.java | 3 --
.../solr/cloud/TestSolrCloudWithKerberosAlt.java | 2 -
.../TestSolrCloudWithSecureImpersonation.java | 2 -
.../solr/cloud/TestTlogReplayVsRecovery.java | 3 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 1 -
.../cloud/TestTolerantUpdateProcessorCloud.java | 7 ++--
35 files changed, 15 insertions(+), 183 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
index 2a92339..1906ab5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AddReplicaTest.java
@@ -149,8 +149,6 @@ public class AddReplicaTest extends SolrCloudTestCase {
CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(collection, "conf1", 2, 1);
create.setMaxShardsPerNode(2);
cloudClient.request(create);
-
- cluster.waitForActiveCollection(collection, 2, 2);
ClusterState clusterState = cloudClient.getZkStateReader().getClusterState();
DocCollection coll = clusterState.getCollection(collection);
diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
index e14f3d6..06d7b21 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
@@ -97,11 +97,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection1meta", "conf", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection2meta", "conf", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection1meta", 2, 2);
- cluster.waitForActiveCollection("collection2meta", 1, 1);
-
- waitForState("Expected collection1 to be created with 2 shards and 1 replica", "collection1meta", clusterShape(2, 2));
- waitForState("Expected collection2 to be created with 1 shard and 1 replica", "collection2meta", clusterShape(1, 1));
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
zkStateReader.createClusterStateWatchersAndUpdate();
List<String> aliases = zkStateReader.getAliases().resolveAliases("meta1");
@@ -388,11 +383,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection1meta", "conf", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection2meta", "conf", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection1meta", 2, 2);
- cluster.waitForActiveCollection("collection2meta", 1, 1);
-
- waitForState("Expected collection1 to be created with 2 shards and 1 replica", "collection1meta", clusterShape(2, 2));
- waitForState("Expected collection2 to be created with 1 shard and 1 replica", "collection2meta", clusterShape(1, 1));
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
zkStateReader.createClusterStateWatchersAndUpdate();
List<String> aliases = zkStateReader.getAliases().resolveAliases(aliasName);
@@ -442,12 +432,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection_old", "conf", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection_new", "conf", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection_old", 2, 2);
- cluster.waitForActiveCollection("collection_new", 1, 1);
-
- waitForState("Expected collection_old to be created with 2 shards and 1 replica", "collection_old", clusterShape(2, 2));
- waitForState("Expected collection_new to be created with 1 shard and 1 replica", "collection_new", clusterShape(1, 1));
-
new UpdateRequest()
.add("id", "6", "a_t", "humpty dumpy sat on a wall")
.add("id", "7", "a_t", "humpty dumpy3 sat on a walls")
@@ -525,12 +509,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection_one", "conf", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection_two", "conf", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection_one", 2, 2);
- cluster.waitForActiveCollection("collection_two", 1, 1);
-
- waitForState("Expected collection_one to be created with 2 shards and 1 replica", "collection_one", clusterShape(2, 2));
- waitForState("Expected collection_two to be created with 1 shard and 1 replica", "collection_two", clusterShape(1, 1));
-
new UpdateRequest()
.add("id", "1", "a_t", "humpty dumpy sat on a wall")
.commit(cluster.getSolrClient(), "collection_one");
@@ -628,12 +606,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection1", "conf", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection2", "conf", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection1", 2, 2);
- cluster.waitForActiveCollection("collection2", 1, 1);
-
- waitForState("Expected collection1 to be created with 2 shards and 1 replica", "collection1", clusterShape(2, 2));
- waitForState("Expected collection2 to be created with 1 shard and 1 replica", "collection2", clusterShape(1, 1));
-
new UpdateRequest()
.add("id", "6", "a_t", "humpty dumpy sat on a wall")
.add("id", "7", "a_t", "humpty dumpy3 sat on a walls")
@@ -792,9 +764,6 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
public void testErrorChecks() throws Exception {
CollectionAdminRequest.createCollection("testErrorChecks-collection", "conf", 2, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("testErrorChecks-collection", 2, 2);
- waitForState("Expected testErrorChecks-collection to be created with 2 shards and 1 replica", "testErrorChecks-collection", clusterShape(2, 2));
-
ignoreException(".");
// Invalid Alias name
diff --git a/solr/core/src/test/org/apache/solr/cloud/AssignBackwardCompatibilityTest.java b/solr/core/src/test/org/apache/solr/cloud/AssignBackwardCompatibilityTest.java
index 22708f5..53b44a1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AssignBackwardCompatibilityTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AssignBackwardCompatibilityTest.java
@@ -55,7 +55,6 @@ public class AssignBackwardCompatibilityTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION, 1, 4)
.setMaxShardsPerNode(1000)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION, 1, 4);
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 086ab7d..80b611e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -180,8 +180,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
.process(cluster.getSolrClient());
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
-
- cluster.waitForActiveCollection(COLL_NAME, 2, 4);
DocCollection coll = cluster.getSolrClient().getClusterStateProvider().getClusterState().getCollection(COLL_NAME);
Map<String, Slice> slices = coll.getSlicesMap();
@@ -321,7 +319,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
String collectionName = "solrj_test";
CollectionAdminResponse response = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2,4);
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
Map<String, NamedList<Integer>> coresStatus = response.getCollectionCoresStatus();
@@ -339,8 +336,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
Map<String,NamedList<Integer>> nodesStatus = response.getCollectionNodesStatus();
assertEquals(4, nodesStatus.size());
- waitForState("Expected " + collectionName + " to disappear from cluster state", collectionName, (n, c) -> c == null);
-
// Test Creating a collection with new stateformat.
collectionName = "solrj_newstateformat";
@@ -349,8 +344,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
.process(cluster.getSolrClient());
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
-
- cluster.waitForActiveCollection(collectionName, 2,4);
}
@Test
@@ -364,8 +357,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
- cluster.waitForActiveCollection(collectionName, 2, 4);
-
String nodeName = (String) response._get("success[0]/key", null);
String corename = (String) response._get(asList("success", nodeName, "core"), null);
@@ -389,9 +380,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
-
- cluster.waitForActiveCollection(collectionName, 2, 6);
-
+
Map<String, NamedList<Integer>> coresStatus = response.getCollectionCoresStatus();
assertEquals(6, coresStatus.size());
@@ -448,8 +437,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 1)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2, 2);
-
CollectionAdminResponse response = CollectionAdminRequest.splitShard(collectionName)
.setShardName("shard1")
.process(cluster.getSolrClient());
@@ -506,8 +493,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
- cluster.waitForActiveCollection(collectionName, 1, 1);
-
Map<String, NamedList<Integer>> coresStatus = response.getCollectionCoresStatus();
assertEquals(1, coresStatus.size());
@@ -527,8 +512,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collectionName = "solrj_replicatests";
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 1, 2);
ArrayList<String> nodeList
= new ArrayList<>(cluster.getSolrClient().getZkStateReader().getClusterState().getLiveNodes());
@@ -538,9 +521,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminResponse response = CollectionAdminRequest.addReplicaToShard(collectionName, "shard1")
.setNode(node)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 1, 3);
-
+
Replica newReplica = grabNewReplica(response, getCollectionState(collectionName));
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
@@ -597,8 +578,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 2, 4);
// Check for value change
CollectionAdminRequest.setCollectionProperty(collectionName, propName, "false")
@@ -630,8 +609,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf2", 2, 2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2, 4);
-
SolrClient client = cluster.getSolrClient();
byte[] binData = collectionName.getBytes("UTF-8");
// index some docs
@@ -711,12 +688,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1).setAlias("col1").process(cluster.getSolrClient());
CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1).setAlias("col2").process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName1, 1, 1);
- cluster.waitForActiveCollection(collectionName2, 1, 1);
-
- waitForState("Expected collection1 to be created with 1 shard and 1 replica", collectionName1, clusterShape(1, 1));
- waitForState("Expected collection2 to be created with 1 shard and 1 replica", collectionName2, clusterShape(1, 1));
-
CollectionAdminRequest.createAlias("compoundAlias", "col1,col2").process(cluster.getSolrClient());
CollectionAdminRequest.createAlias("simpleAlias", "col1").process(cluster.getSolrClient());
CollectionAdminRequest.createCategoryRoutedAlias("catAlias", "field1", 100,
@@ -795,12 +766,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1).process(solrClient);
CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1).process(solrClient);
- cluster.waitForActiveCollection(collectionName1, 1, 1);
- cluster.waitForActiveCollection(collectionName2, 1, 1);
-
- waitForState("Expected collection1 to be created with 1 shard and 1 replica", collectionName1, clusterShape(1, 1));
- waitForState("Expected collection2 to be created with 1 shard and 1 replica", collectionName2, clusterShape(1, 1));
-
SolrInputDocument doc = new SolrInputDocument("id", "1");
solrClient.add(collectionName1, doc);
doc = new SolrInputDocument("id", "2");
@@ -897,8 +862,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collection = "replicaProperties";
CollectionAdminRequest.createCollection(collection, "conf", 2, 2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collection, 2, 4);
final Replica replica = getCollectionState(collection).getLeader("shard1");
CollectionAdminResponse response
@@ -925,8 +888,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collection = "balancedProperties";
CollectionAdminRequest.createCollection(collection, "conf", 2, 2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collection, 2, 4);
CollectionAdminResponse response = CollectionAdminRequest.balanceReplicaProperty(collection, "preferredLeader")
.process(cluster.getSolrClient());
@@ -952,8 +913,6 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collection = "testAddAndDeleteCollectionAttribute";
CollectionAdminRequest.createCollection(collection, "conf", 1, 1)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collection, 1, 1);
CollectionAdminRequest.modifyCollection(collection, null)
.setAttribute("replicationFactor", 25)
diff --git a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java
index b462526..cdec325 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CreateRoutedAliasTest.java
@@ -231,9 +231,6 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection("collection1meta", "_default", 2, 1).process(cluster.getSolrClient());
CollectionAdminRequest.createCollection("collection2meta", "_default", 1, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection1meta", 2, 2);
- cluster.waitForActiveCollection("collection2meta", 1, 1);
-
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
zkStateReader.createClusterStateWatchersAndUpdate();
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
index a243ee2..e7256ba 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
@@ -98,8 +98,6 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
Create req = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2);
req.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 2, 4);
DocCollection state = getCollectionState(collectionName);
Slice shard = getRandomShard(state);
@@ -198,18 +196,10 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
@Test
// commented out on: 17-Feb-2019 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
public void deleteReplicaByCountForAllShards() throws Exception {
-
final String collectionName = "deleteByCountNew";
Create req = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2);
req.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 2, 4);
-
- waitForState("Expected two shards with two replicas each", collectionName, clusterShape(2, 4));
-
CollectionAdminRequest.deleteReplicasFromAllShards(collectionName, 1).process(cluster.getSolrClient());
- waitForState("Expected two shards with one replica each", collectionName, clusterShape(2, 2));
-
}
@Test
@@ -233,14 +223,10 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 3)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 1, 3);
-
cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "1"));
cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "2"));
cluster.getSolrClient().commit(collectionName);
- cluster.waitForActiveCollection(collectionName, 1, 3);
-
Slice shard = getCollectionState(collectionName).getSlice("shard1");
// don't choose the leader to shutdown, it just complicates things unneccessarily
@@ -309,9 +295,6 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
final String collectionName = "raceDeleteReplica_"+legacyCloud;
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 1, 2);
-
Slice shard1 = getCollectionState(collectionName).getSlice("shard1");
Replica leader = shard1.getLeader();
@@ -415,7 +398,6 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
});
leaderJetty.start();
- cluster.waitForNode(leaderJetty, 10000);
cluster.waitForActiveCollection(collectionName, 1, 2);
CollectionAdminRequest.deleteCollection(collectionName).process(cluster.getSolrClient());
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
index a98e771..8c083f5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
@@ -64,7 +64,6 @@ public class DeleteShardTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collection, "conf", 2, 1)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collection, 2, 2);
DocCollection state = getCollectionState(collection);
assertEquals(State.ACTIVE, state.getSlice("shard1").getState());
@@ -120,8 +119,6 @@ public class DeleteShardTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollectionWithImplicitRouter(collection, "conf", "a,b,c", 1)
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collection, 3, 3);
// Get replica details
Replica leader = getCollectionState(collection).getLeader("a");
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
index 5d3a31a..95f0278 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
@@ -164,7 +164,6 @@ public class LeaderTragicEventTest extends SolrCloudTestCase {
CollectionAdminRequest
.createCollection(collection, "config", 1, numReplicas)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collection, 1, numReplicas);
try {
JettySolrRunner otherReplicaJetty = null;
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
index df3f676..4ada09e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java
@@ -120,7 +120,7 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, 1, 1)
.setCreateNodeSet(cluster.getJettySolrRunner(0).getNodeName())
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 1, 1);
+
cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "1"));
cluster.getSolrClient().add(collectionName, new SolrInputDocument("id", "2"));
cluster.getSolrClient().commit(collectionName);
@@ -175,28 +175,21 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase {
CollectionAdminRequest.addReplicaToShard(collectionName, "shard1")
.setNode(cluster.getJettySolrRunner(0).getNodeName())
.process(cluster.getSolrClient());
-
+
cluster.waitForActiveCollection(collectionName, 1, 1);
-
- waitForState("Timeout waiting for shard leader", collectionName, clusterShape(1, 1));
Replica leader = getCollectionState(collectionName).getSlice("shard1").getLeader();
// this replica will ahead of election queue
CollectionAdminRequest.addReplicaToShard(collectionName, "shard1")
.setNode(cluster.getJettySolrRunner(1).getNodeName())
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 1, 2);
-
- waitForState("Timeout waiting for 1x2 collection", collectionName, clusterShape(1, 2));
+
Replica replica1 = getCollectionState(collectionName).getSlice("shard1")
.getReplicas(replica -> replica.getNodeName().equals(cluster.getJettySolrRunner(1).getNodeName())).get(0);
CollectionAdminRequest.addReplicaToShard(collectionName, "shard1")
.setNode(cluster.getJettySolrRunner(2).getNodeName())
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(collectionName, 1, 3);
Replica replica2 = getCollectionState(collectionName).getSlice("shard1")
.getReplicas(replica -> replica.getNodeName().equals(cluster.getJettySolrRunner(2).getNodeName())).get(0);
diff --git a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
index 5405a12..1fa564a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
@@ -95,8 +95,6 @@ public class LegacyCloudClusterPropTest extends SolrCloudTestCase {
.setMaxShardsPerNode(1)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(coll, 1, 1);
-
assertTrue(ClusterStateUtil.waitForAllActiveAndLiveReplicas(cluster.getSolrClient().getZkStateReader(), 120000));
// Insure all mandatory properties are there.
diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
index 79030f2..1315041 100644
--- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
@@ -306,7 +306,6 @@ public class PeerSyncReplicationTest extends SolrCloudBridgeTestCase {
// bring back dead node and ensure it recovers
nodeToBringUp.start();
- cluster.waitForNode(nodeToBringUp, 10);
nodesDown.remove(nodeToBringUp);
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
index d50f032..089de7a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReindexCollectionTest.java
@@ -387,8 +387,6 @@ public class ReindexCollectionTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(name, config, numShards, numReplicas)
.setMaxShardsPerNode(-1)
.process(solrClient);
-
- cluster.waitForActiveCollection(name, numShards, numShards * numReplicas);
}
private void indexDocs(String collection, int numDocs, Function<Integer, SolrInputDocument> generator) throws Exception {
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 6c5a5b6..49fee86 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
@@ -44,7 +44,6 @@ public class RemoteQueryErrorTest extends SolrCloudTestCase {
public void test() throws Exception {
CollectionAdminRequest.createCollection("collection", "conf", 2, 1).process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection", 2, 2);
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
try (SolrClient client = jetty.newClient()) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
index ca7da5e..4fcc97b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeNoTargetTest.java
@@ -81,7 +81,6 @@ public class ReplaceNodeNoTargetTest extends SolrCloudTestCase {
log.info("Creating collection...");
CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf1", 5, 2, 0, 0);
cloudClient.request(create);
- cluster.waitForActiveCollection(coll, 5, 10);
if (log.isInfoEnabled()) {
log.info("Current core status list for node we plan to decommision: {} => {}",
diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
index 1f126a5..df5add6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplaceNodeTest.java
@@ -92,8 +92,6 @@ public class ReplaceNodeTest extends SolrCloudTestCase {
create.setCreateNodeSet(StrUtils.join(l, ',')).setMaxShardsPerNode(3);
cloudClient.request(create);
- cluster.waitForActiveCollection(coll, 5, 5 * (create.getNumNrtReplicas() + create.getNumPullReplicas() + create.getNumTlogReplicas()));
-
DocCollection collection = cloudClient.getZkStateReader().getClusterState().getCollection(coll);
log.debug("### Before decommission: {}", collection);
log.info("excluded_node : {} ", emptyNode);
diff --git a/solr/core/src/test/org/apache/solr/cloud/RoutingToNodesWithPropertiesTest.java b/solr/core/src/test/org/apache/solr/cloud/RoutingToNodesWithPropertiesTest.java
index 0ef4603..1fc4854 100644
--- a/solr/core/src/test/org/apache/solr/cloud/RoutingToNodesWithPropertiesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/RoutingToNodesWithPropertiesTest.java
@@ -90,7 +90,6 @@ public class RoutingToNodesWithPropertiesTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION, 2, 2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION, 2, 4);
// Checking putting replicas
for (Slice slice : getCollectionState(COLLECTION).getSlices()) {
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 e33a5bd..84b8313 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -177,7 +177,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION, "_default", sliceCount, replicationFactor)
.setMaxShardsPerNode(10)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION, sliceCount, sliceCount * replicationFactor);
cloudClient = cluster.getSolrClient();
cloudClient.setDefaultCollection(COLLECTION);
@@ -211,7 +210,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION, "_default", 1, 1)
.setMaxShardsPerNode(10)
.process(controlCluster.getSolrClient());
- controlCluster.waitForActiveCollection(COLLECTION, 1, 1);
controlClient = controlCluster.getSolrClient();
controlClient.setDefaultCollection(COLLECTION);
@@ -283,7 +281,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
.setMaxShardsPerNode(10)
.setCreateNodeSet(null)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
return resp;
}
@@ -292,7 +289,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
.setMaxShardsPerNode(maxShardsPerNode)
.setRouterField(routerField)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
return resp;
}
@@ -301,7 +297,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
.setMaxShardsPerNode(maxShardsPerNode)
.setRouterField(routerField)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
return resp;
}
@@ -310,7 +305,6 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
.setMaxShardsPerNode(maxShardsPerNode)
.setCreateNodeSet(createNodeSetStr)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
return resp;
}
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 68a98d5..4c41f3d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SplitShardTest.java
@@ -82,8 +82,6 @@ public class SplitShardTest extends SolrCloudTestCase {
.setMaxShardsPerNode(100)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION_NAME, 2, 2);
-
CollectionAdminRequest.SplitShard splitShard = CollectionAdminRequest.splitShard(COLLECTION_NAME)
.setNumSubShards(5)
.setShardName("shard1");
@@ -131,8 +129,6 @@ public class SplitShardTest extends SolrCloudTestCase {
.setMaxShardsPerNode(100)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2, 2);
-
CollectionAdminRequest.SplitShard splitShard = CollectionAdminRequest.splitShard(collectionName)
.setSplitFuzz(0.5f)
.setShardName("shard1");
@@ -158,8 +154,6 @@ public class SplitShardTest extends SolrCloudTestCase {
.setMaxShardsPerNode(100)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 1, repFactor);
-
CloudHttp2SolrClient client = cluster.getSolrClient();
client.setDefaultCollection(collectionName);
return client;
diff --git a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
index b8638e5..46e3df7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java
@@ -98,7 +98,7 @@ public class SystemCollectionCompatTest extends SolrCloudTestCase {
.setCreateNodeSet(String.join(",", nodes))
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(CollectionAdminParams.SYSTEM_COLL, 1, 2);
+
// send a dummy doc to the .system collection
SolrInputDocument doc = new SolrInputDocument(
"id", IdUtils.timeRandomId(),
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
index 89eb3ea..5c4eb16 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java
@@ -108,7 +108,6 @@ public class TestAuthenticationFramework extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, configName, numShards, numReplicas)
.setMaxShardsPerNode(maxShardsPerNode)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
index 9a1e8c7..b18c57a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java
@@ -131,7 +131,6 @@ public class TestCloudDeleteByQuery extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION_NAME, configName, NUM_SHARDS, REPLICATION_FACTOR)
.setProperties(collectionProperties)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION_NAME, NUM_SHARDS, REPLICATION_FACTOR * NUM_SHARDS);
CLOUD_CLIENT = cluster.getSolrClient();
CLOUD_CLIENT.setDefaultCollection(COLLECTION_NAME);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
index 767c2ea..8eeeb52 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
@@ -82,7 +82,6 @@ public class TestCloudRecovery extends SolrCloudTestCase {
.createCollection(COLLECTION, "config", 2, nrtReplicas, tlogReplicas, 0)
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(COLLECTION, 2, 2 * (nrtReplicas + tlogReplicas));
// SOLR-12314 : assert that these values are from the solr.xml file and not UpdateShardHandlerConfig#DEFAULT
for (JettySolrRunner jettySolrRunner : cluster.getJettySolrRunners()) {
@@ -130,10 +129,6 @@ public class TestCloudRecovery extends SolrCloudTestCase {
assertTrue("Timeout waiting for all not live", ClusterStateUtil.waitForAllReplicasNotLive(cloudClient.getZkStateReader(), 45000));
ChaosMonkey.start(cluster.getJettySolrRunners());
- for (JettySolrRunner runner : cluster.getJettySolrRunners()) {
- cluster.waitForNode(runner, 10);
- }
-
cluster.waitForActiveCollection(COLLECTION, 2, 2 * (nrtReplicas + tlogReplicas));
resp = cloudClient.query(COLLECTION, params);
@@ -229,10 +224,6 @@ public class TestCloudRecovery extends SolrCloudTestCase {
j.start();
}
- for (JettySolrRunner j : cluster.getJettySolrRunners()) {
- cluster.waitForNode(j, 10);
- }
-
cluster.waitForActiveCollection(COLLECTION, 2, 2 * (nrtReplicas + tlogReplicas));
resp = cloudClient.query(COLLECTION, params);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
index f475034..184b9c7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudSearcherWarming.java
@@ -99,8 +99,6 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
.setCreateNodeSet(cluster.getJettySolrRunner(0).getNodeName());
create.process(solrClient);
- cluster.waitForActiveCollection(collectionName, 1, 1);
-
solrClient.setDefaultCollection(collectionName);
String addListenerCommand = "{" +
@@ -120,8 +118,7 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
JettySolrRunner runner = cluster.getJettySolrRunner(0);
runner.stop();
-
- cluster.waitForJettyToStop(runner);
+
// check waitForState only after we are sure the node has shutdown and have forced an update to liveNodes
// ie: workaround SOLR-13490
cluster.getSolrClient().getZkStateReader().updateLiveNodes();
@@ -129,7 +126,7 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
// restart
sleepTime.set(1000);
runner.start();
- cluster.waitForAllNodes(30);
+
cluster.getSolrClient().getZkStateReader().registerCollectionStateWatcher(collectionName, stateWatcher);
cluster.waitForActiveCollection(collectionName, 1, 1);
assertNull("No replica should have been active without registering a searcher, found: " + failingCoreNodeName.get(), failingCoreNodeName.get());
@@ -186,8 +183,7 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
log.info("Stopping old node 1");
AtomicReference<String> oldNodeName = new AtomicReference<>(cluster.getJettySolrRunner(0).getNodeName());
JettySolrRunner oldNode = cluster.stopJettySolrRunner(0);
-
- cluster.waitForJettyToStop(oldNode);
+
// the newly created replica should become leader
cluster.waitForActiveCollection(collectionName, 1, 1);
// the above call is not enough because we want to assert that the down'ed replica is not active
@@ -223,7 +219,6 @@ public class TestCloudSearcherWarming extends SolrCloudTestCase {
assertSame(oldNode, cluster.stopJettySolrRunner(1)); // old node is now at 1
log.info("Stopping old node 2");
cluster.waitForActiveCollection(collectionName, 1, 1);
- waitForState("", collectionName, collectionStatePredicate);
// reset
coreNameRef.set(null);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
index 17d0cda..f2a2d2d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionWithEmptyReplica.java
@@ -56,8 +56,6 @@ public class TestLeaderElectionWithEmptyReplica extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(COLLECTION_NAME, "config", 1, 1)
.process(cluster.getSolrClient());
-
- cluster.waitForActiveCollection(COLLECTION_NAME, 1, 1);
}
@Test
@@ -91,12 +89,8 @@ public class TestLeaderElectionWithEmptyReplica extends SolrCloudTestCase {
CollectionAdminRequest.AddReplica addReplica = CollectionAdminRequest.addReplicaToShard(COLLECTION_NAME, "shard1");
String asyncId = addReplica.processAsync(solrClient);
- // wait a bit
- Thread.sleep(100);
-
// bring the old leader node back up
replicaJetty.start();
- cluster.waitForNode(replicaJetty, 10);
cluster.waitForActiveCollection(COLLECTION_NAME, 1, 2);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
index 0d8af61..29866ea 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
@@ -274,7 +274,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
CollectionAdminRequest.createCollection(collection, CONF_NAME, NUM_SERVERS, 1)
.withProperty("config", "solrconfig-tlog.xml")
.process(cloudClient);
- cluster.waitForActiveCollection(collection, NUM_SERVERS, NUM_SERVERS);
+
assertEquals("sanity query", 0, cloudClient.query(collection, params("q","*:*")).getStatus());
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
index 821f16e..31e6fcc 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplicaErrorHandling.java
@@ -145,7 +145,6 @@ public void testCantConnectToPullReplica() throws Exception {
CollectionAdminRequest.createCollection(collectionName, "conf", numShards, 1, 0, 1)
.setMaxShardsPerNode(1)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * 2);
addDocs(10);
DocCollection docCollection = assertNumberOfReplicas(numShards, 0, numShards, false, true);
Slice s = docCollection.getSlices().iterator().next();
@@ -188,7 +187,6 @@ public void testCantConnectToPullReplica() throws Exception {
CollectionAdminRequest.createCollection(collectionName, "conf", numShards, 1, 0, 1)
.setMaxShardsPerNode(1)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, numShards, numShards * 2);
addDocs(10);
DocCollection docCollection = assertNumberOfReplicas(numShards, 0, numShards, false, true);
Slice s = docCollection.getSlices().iterator().next();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
index c44c1fd..334f7a2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -148,8 +148,6 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
.withProperty("schema", "schema-psuedo-fields.xml")
.process(CLOUD_CLIENT);
- cluster.waitForActiveCollection(COLLECTION_NAME, numShards, repFactor * numShards);
-
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
CLIENTS.add(getHttpSolrClient(jetty.getBaseUrl() + "/" + COLLECTION_NAME + "/"));
}
@@ -161,6 +159,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
client.close();
}
CLIENTS.clear();
+ CLOUD_CLIENT = null;
}
/**
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
index 649f357..521e126 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java
@@ -73,8 +73,6 @@ public class TestRebalanceLeaders extends SolrCloudTestCase {
.setMaxShardsPerNode((numShards * numReplicas) / numNodes + 1)
.process(cluster.getSolrClient());
assertEquals("Admin request failed; ", 0, resp.getStatus());
- cluster.waitForActiveCollection(COLLECTION_NAME, numShards, numShards * numReplicas);
-
}
@Before
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
index 793e182..485961f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
@@ -84,7 +84,5 @@ public class TestRequestForwarding extends SolrTestCaseJ4 {
if (response.getStatus() != 0 || response.getErrorMessages() != null) {
fail("Could not create collection. Response" + response.toString());
}
- ZkStateReader zkStateReader = solrCluster.getSolrClient().getZkStateReader();
- solrCluster.waitForActiveCollection(name, 2, 2);
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java
index 8bf314e..299d68d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java
@@ -77,7 +77,6 @@ public class TestSkipOverseerOperations extends SolrCloudTestCase {
.collect(Collectors.joining(","))
)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection("collection1", 2, 2);
ZkStateReader reader = cluster.getSolrClient().getZkStateReader();
@@ -143,8 +142,6 @@ public class TestSkipOverseerOperations extends SolrCloudTestCase {
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collection, 2, 4);
-
ZkStateReader reader = cluster.getSolrClient().getZkStateReader();
List<String> nodes = new ArrayList<>();
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
index 726db45..866ef94 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
@@ -133,8 +133,6 @@ public class TestSolrCloudWithKerberosAlt extends SolrCloudTestCase {
.setMaxShardsPerNode(maxShardsPerNode)
.process(client);
- cluster.waitForActiveCollection(collectionName, numShards, numShards * numReplicas);
-
// modify/query collection
new UpdateRequest().add("id", "1").commit(client, collectionName);
QueryResponse rsp = client.query(collectionName, new SolrQuery("*:*"));
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
index 483dde0..ac7a4da 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithSecureImpersonation.java
@@ -186,8 +186,6 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {
};
create.setMaxShardsPerNode(1);
response = create.process(solrCluster.getSolrClient());
-
- miniCluster.waitForActiveCollection(name, 1, 1);
if (response.getStatus() != 0 || response.getErrorMessages() != null) {
fail("Could not create collection. Response" + response.toString());
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
index 32cc0cc..4cd092b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java
@@ -194,8 +194,7 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase {
NODE0.start();
log.info("Waiting for all nodes and active collection...");
-
- cluster.waitForAllNodes(30);;
+
waitForState("Timeout waiting for leader", COLLECTION, (liveNodes, collectionState) -> {
Replica newLeader = collectionState.getLeader("shard1");
return newLeader != null && newLeader.getName().equals(leader.getName());
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
index 23f73b1..10f4cd1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
@@ -159,7 +159,6 @@ public class TestTlogReplica extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 0, 4, 0)
.setMaxShardsPerNode(100)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2, 8);
break;
case 1:
// Sometimes don't use SolrJ
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index cd80a81..2ec79cf 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -55,6 +55,7 @@ import org.apache.solr.common.util.SimpleOrderedMap;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ import org.slf4j.LoggerFactory;
* </p>
*
*/
-@LuceneTestCase.Nightly // nocommit speedup
+@Ignore // nocommit debug
public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -122,8 +123,6 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
.withProperty("config", "solrconfig-distrib-update-processor-chains.xml")
.withProperty("schema", "schema15.xml") // string id for doc routing prefix
.process(CLOUD_CLIENT);
-
- cluster.waitForActiveCollection(COLLECTION_NAME, NUM_SHARDS, REPLICATION_FACTOR * NUM_SHARDS);
ZkStateReader zkStateReader = CLOUD_CLIENT.getZkStateReader();
// really hackish way to get a URL for specific nodes based on shard/replica hosting
@@ -207,7 +206,7 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
close(S_ONE_NON_LEADER_CLIENT); S_ONE_NON_LEADER_CLIENT = null;
close(S_TWO_NON_LEADER_CLIENT); S_TWO_NON_LEADER_CLIENT = null;
close(NO_COLLECTION_CLIENT); NO_COLLECTION_CLIENT = null;
- close(CLOUD_CLIENT); CLOUD_CLIENT = null;
+ CLOUD_CLIENT = null;
}
private static void close(SolrClient client) throws IOException {
[lucene-solr] 01/02: @350 Buff this test.
Posted by ma...@apache.org.
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 10c512cb372dfa4fb05ea1d5300e4876a5f500b2
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 12:36:47 2020 -0500
@350 Buff this test.
---
solr/core/src/test/org/apache/solr/request/TestFaceting.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/request/TestFaceting.java b/solr/core/src/test/org/apache/solr/request/TestFaceting.java
index 0e9284e..2d5f33e 100644
--- a/solr/core/src/test/org/apache/solr/request/TestFaceting.java
+++ b/solr/core/src/test/org/apache/solr/request/TestFaceting.java
@@ -42,7 +42,7 @@ public class TestFaceting extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
// we need DVs on point fields to compute stats & facets
- if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) System.setProperty(NUMERIC_DOCVALUES_SYSPROP,"true");
+ if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) System.setProperty(NUMERIC_DOCVALUES_SYSPROP, "true");
initCore("solrconfig.xml","schema11.xml");
}
@@ -149,7 +149,7 @@ public class TestFaceting extends SolrTestCaseJ4 {
@Test
public void testFacets() throws Exception {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder(10000);
// go over 4096 to test some of the buffer resizing
for (int i=0; i<5000; i++) {
@@ -213,10 +213,10 @@ public class TestFaceting extends SolrTestCaseJ4 {
@Test
public void testRegularBig() throws Exception {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder(5000);
// go over 4096 to test some of the buffer resizing
- int nTerms=7;
+ int nTerms=TEST_NIGHTLY ? 7 : 3;
for (int i=0; i<nTerms; i++) {
sb.append(t(i));
sb.append(' ');
@@ -225,7 +225,7 @@ public class TestFaceting extends SolrTestCaseJ4 {
int i1=1000000;
// int iter=65536+10;
- int iter=1000;
+ int iter= TEST_NIGHTLY ? 1000 : 100;
int commitInterval=iter/9;
for (int i=0; i<iter; i++) {