You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/20 23:59:29 UTC

[23/29] lucene-solr:jira/http2: Start the splitting after the triggers are in place.

Start the splitting after the triggers are in place.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/87cd5b14
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/87cd5b14
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/87cd5b14

Branch: refs/heads/jira/http2
Commit: 87cd5b14aece34e1ee84c253d670f622029cd6c5
Parents: eb0fcec
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Sep 20 10:35:42 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Sep 20 10:36:24 2018 +0200

----------------------------------------------------------------------
 .../autoscaling/ScheduledMaintenanceTriggerTest.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87cd5b14/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java
index 56896a7..840c0bd 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/ScheduledMaintenanceTriggerTest.java
@@ -161,12 +161,6 @@ public class ScheduledMaintenanceTriggerTest extends SolrCloudTestCase {
     CloudTestUtils.waitForState(cloudManager, "failed to create " + collection1, collection1,
         CloudTestUtils.clusterShape(1, 1));
 
-    CollectionAdminRequest.SplitShard split1 = CollectionAdminRequest.splitShard(collection1)
-        .setShardName("shard1");
-    split1.process(solrClient);
-    CloudTestUtils.waitForState(cloudManager, "failed to split " + collection1, collection1,
-        CloudTestUtils.clusterShape(3, 1, true, true));
-
     String setListenerCommand = "{" +
         "'set-listener' : " +
         "{" +
@@ -197,8 +191,17 @@ public class ScheduledMaintenanceTriggerTest extends SolrCloudTestCase {
     response = solrClient.request(req);
     assertEquals(response.get("result").toString(), "success");
 
+
     boolean await = listenerCreated.await(10, TimeUnit.SECONDS);
     assertTrue("listener not created in time", await);
+
+    CollectionAdminRequest.SplitShard split1 = CollectionAdminRequest.splitShard(collection1)
+        .setShardName("shard1");
+    split1.process(solrClient);
+    CloudTestUtils.waitForState(cloudManager, "failed to split " + collection1, collection1,
+        CloudTestUtils.clusterShape(3, 1, true, true));
+
+
     await = triggerFired.await(60, TimeUnit.SECONDS);
     assertTrue("cleanup action didn't run", await);