(solr) branch main updated: SOLR-17711: index fetcher shouldn't have a request timeout (#3356)

[dsmiley]

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new cda6c8c9a8b SOLR-17711: index fetcher shouldn't have a request timeout 
(#3356)
cda6c8c9a8b is described below

commit cda6c8c9a8bdf3cfe22a36889f33d4194e7f700d
Author: Luke Kot-Zaniewski <lkotzanie...@bloomberg.net>
AuthorDate: Thu Jul 3 10:37:00 2025 -0400

    SOLR-17711: index fetcher shouldn't have a request timeout (#3356)
    
    This fixes a regression introduced with switching the SolrClient from 
Apache -> Jetty HttpClient
---
 solr/CHANGES.txt                                                  | 2 ++
 solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2dd391be63a..7f67abc2108 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -337,6 +337,8 @@ Bug Fixes
 
 * SOLR-17805: Exception in TransactionLog constructor deletes the file and 
does not block subsequent updates. (Bruno Roustant)
 
+* SOLR-17711: Remove total request timeout during recovery that was 
inadvertently added. (Luke Kot-Zaniewski)
+
 Dependency Upgrades
 ---------------------
 * SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke)
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 f03ef161441..d3901eee182 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -133,6 +133,7 @@ public class UpdateShardHandler implements SolrInfoBean {
       recoveryOnlyClientBuilder
           .withConnectionTimeout(cfg.getDistributedConnectionTimeout(), 
TimeUnit.MILLISECONDS)
           .withIdleTimeout(cfg.getDistributedSocketTimeout(), 
TimeUnit.MILLISECONDS)
+          .withRequestTimeout(Long.MAX_VALUE, TimeUnit.MILLISECONDS)
           .withMaxConnectionsPerHost(cfg.getMaxUpdateConnectionsPerHost());
     }