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:13:30 UTC
lucene-solr:master: SOLR-11407: Wait for collections to recover
before starting the test.
Repository: lucene-solr
Updated Branches:
refs/heads/master 7dba350c7 -> eb80ca968
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/eb80ca96
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb80ca96
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb80ca96
Branch: refs/heads/master
Commit: eb80ca968ed2f2cf843f833f694f392627bb90a8
Parents: 7dba350
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:12:51 2018 +0100
----------------------------------------------------------------------
.../solr/handler/admin/AutoscalingHistoryHandlerTest.java | 8 +++++---
.../src/java/org/apache/solr/cloud/SolrCloudTestCase.java | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb80ca96/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 fc44578..6f923ea 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 {
@@ -353,14 +355,14 @@ 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;
boolean allActive = true;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb80ca96/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 {