lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject lucene-solr:branch_7x: SOLR-12801: Wait for collection creation in test.
Date Sat, 01 Dec 2018 14:09:19 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 3f8b3b20a -> 2454f6c2b


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/2454f6c2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2454f6c2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2454f6c2

Branch: refs/heads/branch_7x
Commit: 2454f6c2b54ee55468f5340f13dda4f638f20669
Parents: 3f8b3b2
Author: markrmiller <markrmiller@apache.org>
Authored: Sat Dec 1 08:08:44 2018 -0600
Committer: markrmiller <markrmiller@apache.org>
Committed: Sat Dec 1 08:08:44 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/2454f6c2/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


Mime
View raw message