Skip to content

Commit cda6c8c

Browse files
authored
SOLR-17711: index fetcher shouldn't have a request timeout (#3356)
This fixes a regression introduced with switching the SolrClient from Apache -> Jetty HttpClient
1 parent a931e8a commit cda6c8c

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

solr/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ Bug Fixes
337337

338338
* SOLR-17805: Exception in TransactionLog constructor deletes the file and does not block subsequent updates. (Bruno Roustant)
339339

340+
* SOLR-17711: Remove total request timeout during recovery that was inadvertently added. (Luke Kot-Zaniewski)
341+
340342
Dependency Upgrades
341343
---------------------
342344
* SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)

solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public UpdateShardHandler(UpdateShardHandlerConfig cfg) {
133133
recoveryOnlyClientBuilder
134134
.withConnectionTimeout(cfg.getDistributedConnectionTimeout(), TimeUnit.MILLISECONDS)
135135
.withIdleTimeout(cfg.getDistributedSocketTimeout(), TimeUnit.MILLISECONDS)
136+
.withRequestTimeout(Long.MAX_VALUE, TimeUnit.MILLISECONDS)
136137
.withMaxConnectionsPerHost(cfg.getMaxUpdateConnectionsPerHost());
137138
}
138139

0 commit comments

Comments
 (0)