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 2018/12/01 14:09:10 UTC
lucene-solr:master: SOLR-12801: Wait for collection creation in test.
Repository: lucene-solr
Updated Branches:
refs/heads/master 9b0b9032e -> 755044b58
SOLR-12801: Wait for collection creation in test.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/755044b5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/755044b5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/755044b5
Branch: refs/heads/master
Commit: 755044b58f984ecadca3096a3572ee261cd96cdf
Parents: 9b0b903
Author: markrmiller <ma...@apache.org>
Authored: Sat Dec 1 08:08:44 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Sat Dec 1 08:09:03 2018 -0600
----------------------------------------------------------------------
.../cloud/autoscaling/AutoAddReplicasIntegrationTest.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/755044b5/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
index 5ad5764..7b87571 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
@@ -73,7 +73,6 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
}
@Test
- // This apparently fails in both subclasses.
public void testSimple() throws Exception {
JettySolrRunner jetty1 = cluster.getJettySolrRunner(0);
JettySolrRunner jetty2 = cluster.getJettySolrRunner(1);
@@ -83,11 +82,17 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
.setAutoAddReplicas(true)
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
+
+ cluster.waitForActiveCollection(COLLECTION1, 2, 4);
+
CollectionAdminRequest.createCollection(COLLECTION2, "conf", 2, 2)
.setCreateNodeSet(jetty2.getNodeName()+","+jetty3.getNodeName())
.setAutoAddReplicas(false)
.setMaxShardsPerNode(2)
.process(cluster.getSolrClient());
+
+ cluster.waitForActiveCollection(COLLECTION2, 2, 4);
+
// the number of cores in jetty1 (5) will be larger than jetty3 (1)
CollectionAdminRequest.createCollection("testSimple3", "conf", 3, 1)
.setCreateNodeSet(jetty1.getNodeName())
@@ -95,6 +100,8 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
.setMaxShardsPerNode(3)
.process(cluster.getSolrClient());
+ cluster.waitForActiveCollection("testSimple3", 3, 3);
+
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
// start the tests