You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/07/01 07:29:04 UTC
lucene-solr:master: SOLR-9262: Revert changes
Repository: lucene-solr
Updated Branches:
refs/heads/master 2b4420c47 -> 6674969a8
SOLR-9262: Revert changes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6674969a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6674969a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6674969a
Branch: refs/heads/master
Commit: 6674969a8995d694f73e58e706fec8eddcec92e3
Parents: 2b4420c
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Jul 1 12:58:56 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Fri Jul 1 12:58:56 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 7 +------
.../org/apache/solr/update/UpdateShardHandler.java | 13 +------------
2 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6674969a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7a4a86d..0011c76 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -37,12 +37,7 @@ Upgrading from Solr 6.x
* HttpSolrClient#setDefaultMaxConnectionsPerHost and
HttpSolrClient#setMaxTotalConnections have been removed. These now default very
high and can only be changed via param when creating an HttpClient instance.
-
-Bug Fixes
-----------------------
-* SOLR-9262: Connection and read timeouts are being ignored by UpdateShardHandler after SOLR-4509.
- (Mark Miller, shalin)
-
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6674969a/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 30e31ca..5cc77d2 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -60,19 +60,8 @@ public class UpdateShardHandler {
}
ModifiableSolrParams clientParams = new ModifiableSolrParams();
- if (cfg != null) {
- clientParams.set(HttpClientUtil.PROP_SO_TIMEOUT, cfg.getDistributedSocketTimeout());
- clientParams.set(HttpClientUtil.PROP_CONNECTION_TIMEOUT, cfg.getDistributedConnectionTimeout());
- }
+ log.info("Creating UpdateShardHandler HTTP client with params: {}", clientParams);
client = HttpClientUtil.createClient(clientParams, clientConnectionManager);
-
- // following is done only for logging complete configuration.
- // The maxConnections and maxConnectionsPerHost have already been specified on the connection manager
- if (cfg != null) {
- clientParams.set(HttpClientUtil.PROP_MAX_CONNECTIONS, cfg.getMaxUpdateConnections());
- clientParams.set(HttpClientUtil.PROP_MAX_CONNECTIONS_PER_HOST, cfg.getMaxUpdateConnectionsPerHost());
- }
- log.info("Created UpdateShardHandler HTTP client with params: {}", clientParams);
}
public HttpClient getHttpClient() {