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 06:32:02 UTC
[3/4] lucene-solr:master: SOLR-12801: Wait for collections properly.
SOLR-12801: Wait for collections properly.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7f88bfa1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7f88bfa1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7f88bfa1
Branch: refs/heads/master
Commit: 7f88bfa11234a2ad4c688d131c94db574dc6e516
Parents: a3ec5b5
Author: markrmiller <ma...@gmail.com>
Authored: Sat Dec 1 00:10:09 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Sat Dec 1 00:26:03 2018 -0600
----------------------------------------------------------------------
.../apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7f88bfa1/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
index 8163db8..d86bee2 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
@@ -86,6 +86,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(CollectionAdminParams.SYSTEM_COLL, null, 1, 1)
.setCreateNodeSet(systemCollNode)
.process(solrClient);
+ cluster.waitForActiveCollection(CollectionAdminParams.SYSTEM_COLL, 1, 1);
Set<String> otherNodes = cluster.getJettySolrRunners().stream().map(JettySolrRunner::getNodeName)
.collect(Collectors.toSet());
otherNodes.remove(systemCollNode);
@@ -93,8 +94,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
.setCreateNodeSet(String.join(",", otherNodes))
.setMaxShardsPerNode(3)
.process(solrClient);
- waitForRecovery(CollectionAdminParams.SYSTEM_COLL);
- waitForRecovery(COLL_NAME);
+ cluster.waitForActiveCollection(COLL_NAME, 1, 3);
}
public static class TesterListener extends TriggerListenerBase {