Apache Solr open-source search software
SOLR-15025: MiniSolrCloudCluster.waitForAllNodes ignores passed timeout value (#2193)
Tim Dillona7a434dbc459
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.javaindex e14c39b1503..535238e7e30 100644--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java@@ -140,7 +140,7 @@ public class SolrAnalyticsTestCase extends SolrCloudTestCase {private Object queryCloudObject(SolrParams params) {QueryResponse resp;try {- cluster.waitForAllNodes(10000);+ cluster.waitForAllNodes(10);QueryRequest qreq = new QueryRequest(params);resp = qreq.process(cluster.getSolrClient(), COLLECTIONORALIAS);} catch (Exception e) {diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.javaindex c9c40fce46c..1805e6583f0 100644--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.java+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.java@@ -96,7 +96,7 @@ public class LegacyAbstractAnalyticsCloudTest extends SolrCloudTestCase {for (int i = 0; i + 1 < testParams.length;) {params.add(testParams[i++], testParams[i++]);}- cluster.waitForAllNodes(10000);+ cluster.waitForAllNodes(10);QueryRequest qreq = new QueryRequest(params);QueryResponse resp = qreq.process(cluster.getSolrClient(), COLLECTIONORALIAS);final NamedList<Object> response = resp.getResponse();@@ -108,7 +108,7 @@ public class LegacyAbstractAnalyticsCloudTest extends SolrCloudTestCase {protected void assertRequestTimeout(ModifiableSolrParams params)throws IOException, InterruptedException, TimeoutException, SolrServerException {params.set("timeAllowed", 0);- cluster.waitForAllNodes(10000);+ cluster.waitForAllNodes(10);final QueryResponse maybeTimeout = new QueryRequest(params).process(cluster.getSolrClient(), COLLECTIONORALIAS);assertEquals(maybeTimeout.getHeader() + "", 0, maybeTimeout.getStatus());final Boolean partial = maybeTimeout.getHeader()diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.javaindex 57d9a93826b..dc9842233d0 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java@@ -90,6 +90,8 @@ public class MiniSolrCloudCluster {public static final String SOLR_TESTS_SHARDS_WHITELIST = "solr.tests.shardsWhitelist";+ public static final int DEFAULT_TIMEOUT = 30;+public static final String DEFAULT_CLOUD_SOLR_XML = "<solr>\n" +"\n" +" <str name=\"shareSchema\">${shareSchema:false}</str>\n" +@@ -329,7 +331,11 @@ public class MiniSolrCloudCluster {log.info("waitForAllNodes: numServers={}", numServers);int numRunning = 0;- TimeOut timeout = new TimeOut(30, TimeUnit.SECONDS, TimeSource.NANO_TIME);++ if (timeoutSeconds == 0) {+ timeoutSeconds = DEFAULT_TIMEOUT;+ }+ TimeOut timeout = new TimeOut(timeoutSeconds, TimeUnit.SECONDS, TimeSource.NANO_TIME);while (true) {if (timeout.hasTimedOut()) {