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/16 11:21:57 UTC
[lucene-solr] branch reference_impl updated: @208 - Don't inject
random delays in the clean run.
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
The following commit(s) were added to refs/heads/reference_impl by this push:
new 8c619ca @208 - Don't inject random delays in the clean run.
8c619ca is described below
commit 8c619ca1e69c92cc4cacdd779c99f7bbc1d1de03
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Jul 16 06:21:42 2020 -0500
@208 - Don't inject random delays in the clean run.
---
.../cloud/api/collections/CollectionsAPIDistClusterPerZkTest.java | 4 +---
.../solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
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 0a2bf99..d00b2d0 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
@@ -102,8 +102,7 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
System.setProperty("createCollectionWaitTimeTillActive", "10");
TestInjection.randomDelayInCoreCreation = "true:5";
} else {
- System.setProperty("createCollectionWaitTimeTillActive", "5");
- TestInjection.randomDelayInCoreCreation = "true:1";
+ System.setProperty("createCollectionWaitTimeTillActive", "10");
}
// this class deletes all the collections between each test and so really
// stresses a difficult code path - give a higher so timeout for low end hardware to make it through
@@ -464,7 +463,6 @@ public class CollectionsAPIDistClusterPerZkTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
.setMaxShardsPerNode(4)
.process(cluster.getSolrClient());
- cluster.waitForActiveCollection(collectionName, 2, 4);
ArrayList<String> nodeList
= new ArrayList<>(cluster.getSolrClient().getZkStateReader().getClusterState().getLiveNodes());
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
index 1f745a3..0e17c89 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
@@ -63,8 +63,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
System.setProperty("createCollectionWaitTimeTillActive", "10");
TestInjection.randomDelayInCoreCreation = "true:5";
} else {
- System.setProperty("createCollectionWaitTimeTillActive", "5");
- TestInjection.randomDelayInCoreCreation = "true:1";
+ System.setProperty("createCollectionWaitTimeTillActive", "10");
}
configureCluster(4)