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/10/02 05:07:37 UTC
[lucene-solr] branch reference_impl_dev updated (2a423e8 -> 2bda48b)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 2a423e8 @920 Move root shared executor to extend MDCAwareThreadPoolExecutor.
new 1b3491b @921 Back to 1.
new 2bda48b @922 Exploring Http2SolrClient settings.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/java/org/apache/solr/update/UpdateShardHandler.java | 4 ++--
.../org/apache/solr/client/solrj/impl/Http2SolrClient.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
[lucene-solr] 02/02: @922 Exploring Http2SolrClient settings.
Posted by ma...@apache.org.
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
commit 2bda48b42c7c997c828a872e9303768d39e9aa88
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 2 00:00:59 2020 -0500
@922 Exploring Http2SolrClient settings.
---
solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java | 4 ++--
.../java/org/apache/solr/client/solrj/impl/Http2SolrClient.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 06ade8a..0adcb6b 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -105,7 +105,7 @@ public class UpdateShardHandler implements SolrInfoBean {
.connectionTimeout(cfg.getDistributedConnectionTimeout())
.idleTimeout(cfg.getDistributedSocketTimeout());
}
- updateOnlyClient = updateOnlyClientBuilder.markInternalRequest().maxThreadPoolSize(256).maxRequestsQueuedPerDestination(8192).build();
+ updateOnlyClient = updateOnlyClientBuilder.markInternalRequest().maxThreadPoolSize(64).maxRequestsQueuedPerDestination(12000).build();
updateOnlyClient.enableCloseLock();
// updateOnlyClient.addListenerFactory(updateHttpListenerFactory);
Set<String> queryParams = new HashSet<>(2);
@@ -120,7 +120,7 @@ public class UpdateShardHandler implements SolrInfoBean {
// }
// recoveryExecutor = ExecutorUtil.newMDCAwareFixedThreadPool(cfg.getMaxRecoveryThreads(), recoveryThreadFactory);
// } else {
- log.debug("Creating recoveryExecutor with unbounded pool");
+
recoveryExecutor = ParWork.getRootSharedExecutor();
// }
}
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 040e2e0..2f2bdb9 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
@@ -217,7 +217,7 @@ public class Http2SolrClient extends SolrClient {
int minThreads = Integer.getInteger("solr.minHttp2ClientThreads", 12);
SolrQueuedThreadPool httpClientExecutor = new SolrQueuedThreadPool("http2Client", builder.maxThreadPoolSize, minThreads,
this.headers != null && this.headers.containsKey(QoSParams.REQUEST_SOURCE) && this.headers.get(QoSParams.REQUEST_SOURCE).equals(QoSParams.INTERNAL) ? 3000 : 5000,
- new ArrayBlockingQueue<>(256), (int) TimeUnit.SECONDS.toMillis(30), null);
+ null, -1, null);
httpClientExecutor.setLowThreadsThreshold(-1);
boolean sslOnJava8OrLower = ssl && !Constants.JRE_IS_MINIMUM_JAVA9;
@@ -227,12 +227,12 @@ public class Http2SolrClient extends SolrClient {
} else {
log.debug("Create Http2SolrClient with HTTP/1.1 transport");
}
- SolrHttpClientTransportOverHTTP transport = new SolrHttpClientTransportOverHTTP(3);
+ SolrHttpClientTransportOverHTTP transport = new SolrHttpClientTransportOverHTTP(2);
httpClient = new HttpClient(transport, sslContextFactory);
} else {
log.debug("Create Http2SolrClient with HTTP/2 transport");
HTTP2Client http2client = new HTTP2Client();
- http2client.setSelectors(3);
+ http2client.setSelectors(2);
http2client.setIdleTimeout(idleTimeout);
http2client.setMaxConcurrentPushedStreams(512);
http2client.setInputBufferSize(8192);
@@ -964,7 +964,7 @@ public class Http2SolrClient extends SolrClient {
public static class Builder {
- public int maxThreadPoolSize = Integer.getInteger("solr.maxHttp2ClientThreads", Math.max(256, ParWork.PROC_COUNT));
+ public int maxThreadPoolSize = Integer.getInteger("solr.maxHttp2ClientThreads", Math.max(64, ParWork.PROC_COUNT));
public int maxRequestsQueuedPerDestination = 2048;
private Http2SolrClient http2SolrClient;
private SSLConfig sslConfig = defaultSSLConfig;
[lucene-solr] 01/02: @921 Back to 1.
Posted by ma...@apache.org.
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
commit 1b3491be1823816af3f9c33e963230159d65d87b
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 1 23:50:49 2020 -0500
@921 Back to 1.
---
.../src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 eb6ff29..040e2e0 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
@@ -250,7 +250,7 @@ public class Http2SolrClient extends SolrClient {
httpClient.setExecutor(httpClientExecutor);
httpClient.manage(httpClientExecutor);
httpClient.setStrictEventOrdering(strictEventOrdering);
- httpClient.setSocketAddressResolver(new SocketAddressResolver.Sync());
+ // httpClient.setSocketAddressResolver(new SocketAddressResolver.Sync());
httpClient.setConnectBlocking(false);
httpClient.setFollowRedirects(false);
if (builder.maxConnectionsPerHost != null) httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
@@ -970,7 +970,7 @@ public class Http2SolrClient extends SolrClient {
private SSLConfig sslConfig = defaultSSLConfig;
private Integer idleTimeout = Integer.getInteger("solr.http2solrclient.default.idletimeout", 120000);
private Integer connectionTimeout;
- private Integer maxConnectionsPerHost = 4;
+ private Integer maxConnectionsPerHost = 1;
private boolean useHttp1_1 = Boolean.getBoolean("solr.http1");
protected String baseSolrUrl;
protected Map<String,String> headers = new ConcurrentHashMap<>();