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/05/28 18:34:39 UTC
lucene-solr:master: SOLR-12314: Use http timeout's defined in
solr.xml for creating ConcurrentUpdateSolrClient during indexing requests
between leader and replica
Repository: lucene-solr
Updated Branches:
refs/heads/master 11cfb8648 -> 071df6e11
SOLR-12314: Use http timeout's defined in solr.xml for creating ConcurrentUpdateSolrClient during indexing requests between leader and replica
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/071df6e1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/071df6e1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/071df6e1
Branch: refs/heads/master
Commit: 071df6e114c3af51de5545c9363189c8692311c1
Parents: 11cfb86
Author: Varun Thacker <va...@apache.org>
Authored: Mon May 28 11:21:49 2018 -0700
Committer: Varun Thacker <va...@apache.org>
Committed: Mon May 28 11:21:49 2018 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/update/StreamingSolrClients.java | 9 ++++++++-
.../org/apache/solr/update/UpdateShardHandler.java | 13 +++++++++++++
.../test/org/apache/solr/cloud/TestCloudRecovery.java | 10 ++++++++++
4 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/071df6e1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cbaf06c..3565db1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -260,6 +260,9 @@ Bug Fixes
* SOLR-12294: update processors loaded from runtime jars fail to load if they are specified
in an update processor chain (noble)
+* SOLR-12314: Use http timeout's defined in solr.xml for creating ConcurrentUpdateSolrClient during
+ indexing requests between leader and replica ( Mark Miller, Varun Thacker)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/071df6e1/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
index cc1f755..eb4caec 100644
--- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
+++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java
@@ -51,10 +51,15 @@ public class StreamingSolrClients {
private ExecutorService updateExecutor;
+ private int socketTimeout;
+ private int connectionTimeout;
+
public StreamingSolrClients(UpdateShardHandler updateShardHandler) {
this.updateExecutor = updateShardHandler.getUpdateExecutor();
httpClient = updateShardHandler.getUpdateOnlyHttpClient();
+ socketTimeout = updateShardHandler.getSocketTimeout();
+ connectionTimeout = updateShardHandler.getConnectionTimeout();
}
public List<Error> getErrors() {
@@ -78,6 +83,8 @@ public class StreamingSolrClients {
.withThreadCount(runnerCount)
.withExecutorService(updateExecutor)
.alwaysStreamDeletes()
+ .withSocketTimeout(socketTimeout)
+ .withConnectionTimeout(connectionTimeout)
.build();
client.setPollQueueTime(Integer.MAX_VALUE); // minimize connections created
client.setParser(new BinaryResponseParser());
@@ -160,7 +167,7 @@ class ErrorReportingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClien
this.req = req;
this.errors = errors;
}
-
+
public ErrorReportingConcurrentUpdateSolrClient build() {
return new ErrorReportingConcurrentUpdateSolrClient(this);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/071df6e1/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 8adf902..54dfdf9 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -78,6 +78,9 @@ 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;
+
public UpdateShardHandler(UpdateShardHandlerConfig cfg) {
updateOnlyConnectionManager = new InstrumentedPoolingHttpClientConnectionManager(HttpClientUtil.getSchemaRegisteryProvider().getSchemaRegistry());
defaultConnectionManager = new InstrumentedPoolingHttpClientConnectionManager(HttpClientUtil.getSchemaRegisteryProvider().getSchemaRegistry());
@@ -92,6 +95,8 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoBean {
if (cfg != null) {
clientParams.set(HttpClientUtil.PROP_SO_TIMEOUT, cfg.getDistributedSocketTimeout());
clientParams.set(HttpClientUtil.PROP_CONNECTION_TIMEOUT, cfg.getDistributedConnectionTimeout());
+ socketTimeout = cfg.getDistributedSocketTimeout();
+ connectionTimeout = cfg.getDistributedConnectionTimeout();
}
HttpClientMetricNameStrategy metricNameStrategy = KNOWN_METRIC_NAME_STRATEGIES.get(UpdateShardHandlerConfig.DEFAULT_METRICNAMESTRATEGY);
if (cfg != null) {
@@ -210,4 +215,12 @@ public class UpdateShardHandler implements SolrMetricProducer, SolrInfoBean {
}
}
+ public int getSocketTimeout() {
+ return socketTimeout;
+ }
+
+ public int getConnectionTimeout() {
+ return connectionTimeout;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/071df6e1/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
index 8cb959e..283be53 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java
@@ -43,6 +43,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.update.DirectUpdateHandler2;
import org.apache.solr.update.UpdateLog;
+import org.apache.solr.update.UpdateShardHandler;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -68,6 +69,15 @@ public class TestCloudRecovery extends SolrCloudTestCase {
.process(cluster.getSolrClient());
AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTION, cluster.getSolrClient().getZkStateReader(),
false, true, 30);
+
+ //SOLR-12314 : assert that these values are from the solr.xml file and not UpdateShardHandlerConfig#DEFAULT
+ for (JettySolrRunner jettySolrRunner : cluster.getJettySolrRunners()) {
+ UpdateShardHandler shardHandler = jettySolrRunner.getCoreContainer().getUpdateShardHandler();
+ int socketTimeout = shardHandler.getSocketTimeout();
+ int connectionTimeout = shardHandler.getConnectionTimeout();
+ assertEquals(340000, socketTimeout);
+ assertEquals(45000, connectionTimeout);
+ }
}
@Before