You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/02/28 12:23:28 UTC
[2/2] lucene-solr:branch_7x: SOLR-11407: Wait for collections to
recover before starting the test.
SOLR-11407: Wait for collections to recover before starting the 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/84b63520
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/84b63520
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/84b63520
Branch: refs/heads/branch_7x
Commit: 84b6352057257463d19e67e1c8e544bd57d6b4db
Parents: a5dc944
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Feb 28 13:12:51 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Feb 28 13:23:07 2018 +0100
----------------------------------------------------------------------
.../solr/handler/admin/AutoscalingHistoryHandlerTest.java | 9 ++++++---
.../src/java/org/apache/solr/cloud/SolrCloudTestCase.java | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b63520/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 d927597..9860070 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
@@ -93,6 +93,8 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
.setCreateNodeSet(String.join(",", otherNodes))
.setMaxShardsPerNode(3)
.process(solrClient);
+ waitForRecovery(CollectionAdminParams.SYSTEM_COLL);
+ waitForRecovery(COLL_NAME);
}
public static class TesterListener extends TriggerListenerBase {
@@ -350,14 +352,15 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
if (docs.size() != expected) {
log.info("History query: " + query);
log.info("Wrong response: " + rsp);
- query = params(CommonParams.QT, CommonParams.AUTOSCALING_HISTORY_PATH);
- log.info("Full response: " + client.query(query));
+ ModifiableSolrParams fullQuery = params(CommonParams.QT, CommonParams.AUTOSCALING_HISTORY_PATH);
+ log.info("Full response: " + client.query(fullQuery));
}
assertEquals("Wrong number of documents", expected, docs.size());
return docs;
}
- private void waitForRecovery(String collection) throws Exception {
+ private static void waitForRecovery(String collection) throws Exception {
+ log.info("Waiting for recovery of " + collection);
boolean recovered = false;
for (int i = 0; i < 300; i++) {
ClusterState state = solrClient.getZkStateReader().getClusterState();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/84b63520/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
index 42c4577..b8bf1f4 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
@@ -243,7 +243,7 @@ public class SolrCloudTestCase extends SolrTestCaseJ4 {
/**
* Get the collection state for a particular collection
*/
- protected DocCollection getCollectionState(String collectionName) {
+ protected static DocCollection getCollectionState(String collectionName) {
return cluster.getSolrClient().getZkStateReader().getClusterState().getCollection(collectionName);
}
@@ -256,7 +256,7 @@ public class SolrCloudTestCase extends SolrTestCaseJ4 {
* @param collection the collection to watch
* @param predicate a predicate to match against the collection state
*/
- protected void waitForState(String message, String collection, CollectionStatePredicate predicate) {
+ protected static void waitForState(String message, String collection, CollectionStatePredicate predicate) {
AtomicReference<DocCollection> state = new AtomicReference<>();
AtomicReference<Set<String>> liveNodesLastSeen = new AtomicReference<>();
try {