You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2018/09/01 13:20:46 UTC
lucene-solr:master: SOLR-10697: HttpShardHandler now uses a default
of 100k as maxConnections (10k previously) and default maxConnectionsPerHost
as 100k (20 previously). They are now consisent with the UpdateShardHandler
defaults
Repository: lucene-solr
Updated Branches:
refs/heads/master d55a81df8 -> 606e529f9
SOLR-10697: HttpShardHandler now uses a default of 100k as maxConnections (10k previously) and default maxConnectionsPerHost as 100k (20 previously). They are now consisent with the UpdateShardHandler defaults
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/606e529f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/606e529f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/606e529f
Branch: refs/heads/master
Commit: 606e529f9376f3b36d4e3248776fb413f111e03b
Parents: d55a81d
Author: Varun Thacker <va...@apache.org>
Authored: Sat Sep 1 07:20:15 2018 -0600
Committer: Varun Thacker <va...@apache.org>
Committed: Sat Sep 1 07:20:15 2018 -0600
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++++
.../core/src/java/org/apache/solr/core/SolrXmlConfig.java | 9 +++++----
.../solr/handler/component/HttpShardHandlerFactory.java | 8 ++++----
.../java/org/apache/solr/update/UpdateShardHandler.java | 4 ++--
.../org/apache/solr/update/UpdateShardHandlerConfig.java | 10 ++++------
.../org/apache/solr/client/solrj/impl/HttpClientUtil.java | 2 ++
.../src/java/org/apache/solr/util/TestHarness.java | 5 +++--
7 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 94b12be4..f196db2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -328,6 +328,10 @@ Optimizations
in the fl (field list) parameter, we save on one doc-value lookup. This can bring performance improvements of 15%
and upwards depending on how many fields are in common. (Amrit Sarkar, Varun Thacker)
+* SOLR-10697: HttpShardHandler now uses a default of 100k as maxConnections (10k previously) and default
+ maxConnectionsPerHost as 100k (20 previously). They are now consisent with the UpdateShardHandler defaults.
+ (Varun Thacker)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index c89395a..6636a8f 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -36,6 +36,7 @@ import java.util.Set;
import com.google.common.base.Strings;
import org.apache.commons.io.IOUtils;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.logging.LogWatcherConfig;
@@ -295,10 +296,10 @@ public class SolrXmlConfig {
boolean defined = false;
- int maxUpdateConnections = UpdateShardHandlerConfig.DEFAULT_MAXUPDATECONNECTIONS;
- int maxUpdateConnectionsPerHost = UpdateShardHandlerConfig.DEFAULT_MAXUPDATECONNECTIONSPERHOST;
- int distributedSocketTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATESOTIMEOUT;
- int distributedConnectionTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATECONNTIMEOUT;
+ int maxUpdateConnections = HttpClientUtil.DEFAULT_MAXCONNECTIONS;
+ int maxUpdateConnectionsPerHost = HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST;
+ int distributedSocketTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
+ int distributedConnectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
String metricNameStrategy = UpdateShardHandlerConfig.DEFAULT_METRICNAMESTRATEGY;
int maxRecoveryThreads = UpdateShardHandlerConfig.DEFAULT_MAXRECOVERYTHREADS;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index b0d3dd8..1bb1fdb 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -93,10 +93,10 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
protected InstrumentedHttpRequestExecutor httpRequestExecutor;
private LBHttpSolrClient loadbalancer;
//default values:
- int soTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATESOTIMEOUT;
- int connectionTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATECONNTIMEOUT;
- int maxConnectionsPerHost = 20;
- int maxConnections = 10000;
+ int soTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
+ int connectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
+ int maxConnectionsPerHost = HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST;
+ int maxConnections = HttpClientUtil.DEFAULT_MAXCONNECTIONS;
int corePoolSize = 0;
int maximumPoolSize = Integer.MAX_VALUE;
int keepAliveTime = 5;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
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 54dfdf9..bc013bb 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -78,8 +78,8 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoBean {
private final Set<String> metricNames = ConcurrentHashMap.newKeySet();
private MetricRegistry registry;
- private int socketTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATESOTIMEOUT;
- private int connectionTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATECONNTIMEOUT;
+ private int socketTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
+ private int connectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
public UpdateShardHandler(UpdateShardHandlerConfig cfg) {
updateOnlyConnectionManager = new InstrumentedPoolingHttpClientConnectionManager(HttpClientUtil.getSchemaRegisteryProvider().getSchemaRegistry());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java
index a8b6953..f0b212e 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java
@@ -16,18 +16,16 @@
*/
package org.apache.solr.update;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
+
public class UpdateShardHandlerConfig {
- public static final int DEFAULT_DISTRIBUPDATECONNTIMEOUT = 60000;
- public static final int DEFAULT_DISTRIBUPDATESOTIMEOUT = 600000;
- public static final int DEFAULT_MAXUPDATECONNECTIONS = 100000;
- public static final int DEFAULT_MAXUPDATECONNECTIONSPERHOST = 100000;
public static final String DEFAULT_METRICNAMESTRATEGY = "queryLessURLAndMethod";
public static final int DEFAULT_MAXRECOVERYTHREADS = -1;
public static final UpdateShardHandlerConfig DEFAULT
- = new UpdateShardHandlerConfig(DEFAULT_MAXUPDATECONNECTIONS, DEFAULT_MAXUPDATECONNECTIONSPERHOST,
- DEFAULT_DISTRIBUPDATESOTIMEOUT, DEFAULT_DISTRIBUPDATECONNTIMEOUT,
+ = new UpdateShardHandlerConfig(HttpClientUtil.DEFAULT_MAXCONNECTIONS, HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST,
+ HttpClientUtil.DEFAULT_SO_TIMEOUT, HttpClientUtil.DEFAULT_CONNECT_TIMEOUT,
DEFAULT_METRICNAMESTRATEGY, DEFAULT_MAXRECOVERYTHREADS);
private final int maxUpdateConnections;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
index d538b18..c97ef94 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
@@ -77,6 +77,8 @@ public class HttpClientUtil {
public static final int DEFAULT_CONNECT_TIMEOUT = 60000;
public static final int DEFAULT_SO_TIMEOUT = 600000;
+ public static final int DEFAULT_MAXCONNECTIONSPERHOST = 100000;
+ public static final int DEFAULT_MAXCONNECTIONS = 100000;
private static final int VALIDATE_AFTER_INACTIVITY_DEFAULT = 3000;
private static final int EVICT_IDLE_CONNECTIONS_DEFAULT = 50000;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/606e529f/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
index 4a6e90a..9e5260d 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import com.google.common.collect.ImmutableList;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
@@ -189,8 +190,8 @@ public class TestHarness extends BaseTestHarness {
if (System.getProperty("zkHost") == null)
cloudConfig = null;
UpdateShardHandlerConfig updateShardHandlerConfig = new UpdateShardHandlerConfig(
- UpdateShardHandlerConfig.DEFAULT_MAXUPDATECONNECTIONS,
- UpdateShardHandlerConfig.DEFAULT_MAXUPDATECONNECTIONSPERHOST,
+ HttpClientUtil.DEFAULT_MAXCONNECTIONS,
+ HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST,
30000, 30000,
UpdateShardHandlerConfig.DEFAULT_METRICNAMESTRATEGY, UpdateShardHandlerConfig.DEFAULT_MAXRECOVERYTHREADS);
// universal default metric reporter