Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9262: Revert changes

This commit is contained in:
Shalin Shekhar Mangar 2016-07-01 12:58:56 +05:30
parent 2b4420c473
commit 6674969a89
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -38,11 +38,6 @@ Upgrading from Solr 6.x
HttpSolrClient#setMaxTotalConnections have been removed. These now default very HttpSolrClient#setMaxTotalConnections have been removed. These now default very
high and can only be changed via param when creating an HttpClient instance. 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 Optimizations
---------------------- ----------------------

13
solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
View File

@ -60,19 +60,8 @@ public class UpdateShardHandler {
} }
ModifiableSolrParams clientParams = new ModifiableSolrParams(); ModifiableSolrParams clientParams = new ModifiableSolrParams();
if (cfg != null) { log.info("Creating UpdateShardHandler HTTP client with params: {}", clientParams);
clientParams.set(HttpClientUtil.PROP_SO_TIMEOUT, cfg.getDistributedSocketTimeout());
clientParams.set(HttpClientUtil.PROP_CONNECTION_TIMEOUT, cfg.getDistributedConnectionTimeout());
}
client = HttpClientUtil.createClient(clientParams, clientConnectionManager); 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() { public HttpClient getHttpClient() {