Apache Solr open-source search software
SOLR-17711: index fetcher shouldn't have a request timeout (#3356)
Luke Kot-Zaniewskicda6c8c9a8bd
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 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.javaindex 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());}