You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by md...@apache.org on 2021/01/29 17:22:23 UTC
[lucene-solr] branch master updated: SOLR-15025:
MiniSolrCloudCluster.waitForAllNodes ignores passed timeout value (#2193)
This is an automated email from the ASF dual-hosted git repository.
mdrob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new a7a434d SOLR-15025: MiniSolrCloudCluster.waitForAllNodes ignores passed timeout value (#2193)
a7a434d is described below
commit a7a434dbc45940553949214335810cef37b947bb
Author: Tim Dillon <ti...@itsdits.com>
AuthorDate: Sat Jan 30 02:22:06 2021 +0900
SOLR-15025: MiniSolrCloudCluster.waitForAllNodes ignores passed timeout value (#2193)
* Change timeout values to seconds
---
.../src/test/org/apache/solr/analytics/SolrAnalyticsTestCase.java | 2 +-
.../solr/analytics/legacy/LegacyAbstractAnalyticsCloudTest.java | 4 ++--
.../src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 8 +++++++-
3 files changed, 10 insertions(+), 4 deletions(-)
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.java
index e14c39b..535238e 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.java
index c9c40fc..1805e65 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.java
index 57d9a93..dc98422 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()) {