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 2020/09/09 04:55:06 UTC
[lucene-solr] branch reference_impl_dev updated: @816 Anyone call
for a janitor? Cleanup related to the previous test work.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 537529e @816 Anyone call for a janitor? Cleanup related to the previous test work.
537529e is described below
commit 537529ebfb653734a3ff7f69d8aa258a4b995e52
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Sep 8 23:54:37 2020 -0500
@816 Anyone call for a janitor? Cleanup related to the previous test work.
---
.../client/solrj/embedded/JettySolrRunner.java | 6 ++---
.../test/org/apache/solr/cloud/SyncSliceTest.java | 11 ++++-----
.../solr/client/solrj/impl/Http2SolrClient.java | 2 +-
.../solrj/impl/CloudHttp2SolrClientTest.java | 14 ++++++------
.../src/java/org/apache/solr/SolrTestCase.java | 26 +++++++++++-----------
5 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 51c0816..272bc29 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -109,7 +109,7 @@ public class JettySolrRunner implements Closeable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// NOTE: should be larger than HttpClientUtil.DEFAULT_SO_TIMEOUT or typical client SO timeout
- private static final int THREAD_POOL_MAX_IDLE_TIME_MS = HttpClientUtil.DEFAULT_SO_TIMEOUT + 30000;
+ private static final int THREAD_POOL_MAX_IDLE_TIME_MS = 30000;
Server server;
@@ -324,6 +324,7 @@ public class JettySolrRunner implements Closeable {
final SslContextFactory.Server sslcontext = SSLConfig.createContextFactory(config.sslConfig);
HttpConfiguration configuration = new HttpConfiguration();
+ configuration.setIdleTimeout(Integer.getInteger("solr.containerThreadsIdle", THREAD_POOL_MAX_IDLE_TIME_MS));
ServerConnector connector;
if (sslcontext != null) {
configuration.setSecureScheme("https");
@@ -368,16 +369,15 @@ public class JettySolrRunner implements Closeable {
connector.setSoLingerTime(-1);
connector.setPort(port);
connector.setHost("127.0.0.1");
- connector.setIdleTimeout(Integer.getInteger("solr.containerThreadsIdle", THREAD_POOL_MAX_IDLE_TIME_MS));
server.setConnectors(new Connector[] {connector});
server.setSessionIdManager(new NoopSessionManager());
} else {
HttpConfiguration configuration = new HttpConfiguration();
+ configuration.setIdleTimeout(Integer.getInteger("solr.containerThreadsIdle", THREAD_POOL_MAX_IDLE_TIME_MS));
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(configuration));
connector.setReuseAddress(true);
connector.setPort(port);
connector.setSoLingerTime(-1);
- connector.setIdleTimeout(Integer.getInteger("solr.containerThreadsIdle", THREAD_POOL_MAX_IDLE_TIME_MS));
server.setConnectors(new Connector[] {connector});
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
index 44bcbd9..84ae349 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.solr.cloud;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
@@ -41,6 +41,7 @@ import java.util.List;
*/
@Slow
// nocommit - bridge does not yet have some consistency checks here, finish and back in control client
+@LuceneTestCase.Nightly
public class SyncSliceTest extends SolrCloudBridgeTestCase {
private boolean success = false;
@@ -106,13 +107,13 @@ public class SyncSliceTest extends SolrCloudBridgeTestCase {
request.setPath("/admin/collections");
String baseUrl = replicas.get(1).getBaseUrl();
+ request.setBasePath(baseUrl);
// baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());
// we only set the connect timeout, not so timeout
- try (Http2SolrClient baseClient = SolrTestCaseJ4
- .getHttpSolrClient(baseUrl, 10000)) {
- baseClient.request(request);
- }
+ Http2SolrClient baseClient = cluster.getSolrClient().getHttpClient();
+ baseClient.request(request);
+
// waitForThingsToLevelOut(15, TimeUnit.SECONDS);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
index 2c00739..6b25c71 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java
@@ -227,7 +227,7 @@ public class Http2SolrClient extends SolrClient {
if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
}
// nocommit - look at config again as well
- httpClientExecutor = new SolrQueuedThreadPool("httpClient", Math.max(12, ParWork.PROC_COUNT), 6, idleTimeout);
+ httpClientExecutor = new SolrQueuedThreadPool("httpClient", Math.max(14, ParWork.PROC_COUNT), 8, idleTimeout);
httpClientExecutor.setLowThreadsThreshold(-1);
httpClient.setIdleTimeout(idleTimeout);
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
index 72b0a7a..d4765b6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java
@@ -254,9 +254,8 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
assertEquals(0, docs.getNumFound());
// Test Multi-Threaded routed updates for UpdateRequest
- try (CloudSolrClient threadedClient = new SolrTestCaseJ4.CloudSolrClientBuilder
+ try (CloudHttp2SolrClient threadedClient = new SolrTestCaseJ4.CloudHttp2SolrClientBuilder
(Collections.singletonList(cluster.getZkServer().getZkAddress()), Optional.empty())
- .withParallelUpdates(true)
.build()) {
threadedClient.setDefaultCollection("routing_collection");
NamedList<Object> response = threadedClient.request(request);
@@ -277,11 +276,12 @@ public class CloudHttp2SolrClientTest extends SolrCloudTestCase {
params.add("q", "id:" + id);
params.add("distrib", "false");
QueryRequest queryRequest = new QueryRequest(params);
- try (Http2SolrClient solrClient = SolrTestCaseJ4.getHttpSolrClient(url)) {
- QueryResponse queryResponse = queryRequest.process(solrClient);
- SolrDocumentList docList = queryResponse.getResults();
- assertTrue(docList.getNumFound() == 1);
- }
+ queryRequest.setBasePath(url);
+ Http2SolrClient solrClient = threadedClient.getHttpClient();
+ QueryResponse queryResponse = queryRequest.process(solrClient);
+ SolrDocumentList docList = queryResponse.getResults();
+ assertTrue(docList.getNumFound() == 1);
+
}
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 5256099..2dae629 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -299,19 +299,19 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.tests.ramBufferSizeMB", "100");
- System.setProperty("solr.http2solrclient.default.idletimeout", "15000");
+ System.setProperty("solr.http2solrclient.default.idletimeout", "10000");
System.setProperty("distribUpdateSoTimeout", "15000");
- System.setProperty("socketTimeout", "3000");
- System.setProperty("connTimeout", "3000");
- System.setProperty("solr.test.socketTimeout.default", "3000");
- System.setProperty("solr.connect_timeout.default", "3000");
+ System.setProperty("socketTimeout", "10000");
+ System.setProperty("connTimeout", "10000");
+ System.setProperty("solr.test.socketTimeout.default", "10000");
+ System.setProperty("solr.connect_timeout.default", "10000");
System.setProperty("solr.so_commit_timeout.default", "15000");
- System.setProperty("solr.httpclient.defaultConnectTimeout", "3000");
- System.setProperty("solr.httpclient.defaultSoTimeout", "3000");
- // System.setProperty("solr.containerThreadsIdle", "30000"); no need to set
+ System.setProperty("solr.httpclient.defaultConnectTimeout", "10000");
+ System.setProperty("solr.httpclient.defaultSoTimeout", "10000");
+ System.setProperty("solr.containerThreadsIdle", "30000");
- System.setProperty("solr.indexfetcher.sotimeout", "3000");
- System.setProperty("solr.indexfetch.so_timeout.default", "3000");
+ System.setProperty("solr.indexfetcher.sotimeout", "5000");
+ System.setProperty("solr.indexfetch.so_timeout.default", "5000");
System.setProperty("prepRecoveryReadTimeoutExtraWait", "100");
System.setProperty("validateAfterInactivity", "-1");
@@ -332,9 +332,9 @@ public class SolrTestCase extends LuceneTestCase {
System.setProperty("solr.default.collection_op_timeout", "15000");
- System.setProperty("solr.httpclient.retries", "2");
- System.setProperty("solr.retries.on.forward", "2");
- System.setProperty("solr.retries.to.followers", "2");
+ System.setProperty("solr.httpclient.retries", "1");
+ System.setProperty("solr.retries.on.forward", "1");
+ System.setProperty("solr.retries.to.followers", "1");
SolrTestCaseJ4.useFactory("org.apache.solr.core.RAMDirectoryFactory");
System.setProperty("solr.lock.type", "single");