You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2025/12/06 17:28:15 UTC
(solr) branch branch_9x updated (e3de608f287 -> 5f15fe28505)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from e3de608f287 SOLR-18006 Fix precommit (#3927)
new 89b682f8399 TikaServerExtractionBackend now sets idleTimeout (#3926)
new 5f15fe28505 Fix changelog for #3926
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...SpatialField.yml => PR#3926-tika-server-idle-timeout-fix.yml} | 9 +++------
.../solr/handler/extraction/TikaServerExtractionBackend.java | 2 ++
2 files changed, 5 insertions(+), 6 deletions(-)
copy changelog/unreleased/{SOLR-18006-Fix reverse dist sorting on LatLonPointSpatialField.yml => PR#3926-tika-server-idle-timeout-fix.yml} (52%)
(solr) 01/02: TikaServerExtractionBackend now sets idleTimeout (#3926)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 89b682f839982fc17d8b94dd3bdb853c9299458c
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Sat Dec 6 15:56:17 2025 +0100
TikaServerExtractionBackend now sets idleTimeout (#3926)
(cherry picked from commit 160076dad1a0d5b1866b7ed67115c58dc4905d63)
---
changelog/unreleased/tika-server-idle-timeout-fix.yml | 9 +++++++++
.../solr/handler/extraction/TikaServerExtractionBackend.java | 2 ++
2 files changed, 11 insertions(+)
diff --git a/changelog/unreleased/tika-server-idle-timeout-fix.yml b/changelog/unreleased/tika-server-idle-timeout-fix.yml
new file mode 100644
index 00000000000..36d2206609e
--- /dev/null
+++ b/changelog/unreleased/tika-server-idle-timeout-fix.yml
@@ -0,0 +1,9 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: When using SolrCell with TikaServer, the connection will no longer timeout after 30s idle, such as during OCR processing
+type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
+authors:
+ - name: Jan Høydahl
+ url: https://home.apache.org/phonebook.html?uid=janhoy
+links:
+ - name: SOLR-XXXX
+ url: https://issues.apache.org/jira/browse/SOLR-XXXX
diff --git a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
index b5c65aba27c..b53d78931f7 100644
--- a/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
+++ b/solr/modules/extraction/src/java/org/apache/solr/handler/extraction/TikaServerExtractionBackend.java
@@ -177,6 +177,8 @@ public class TikaServerExtractionBackend implements ExtractionBackend {
? Duration.ofSeconds(request.tikaServerTimeoutSeconds)
: defaultTimeout;
req.timeout(effectiveTimeout.toMillis(), TimeUnit.MILLISECONDS);
+ // Also set idle timeout in case of heavy server side work like OCR
+ req.idleTimeout(effectiveTimeout.toMillis(), TimeUnit.MILLISECONDS);
// Headers
String accept = (request.tikaServerRecursive ? "application/json" : "text/xml");
(solr) 02/02: Fix changelog for #3926
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 5f15fe2850501bdf6e038c2a1bf0d1bb28cebf95
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Sat Dec 6 16:01:08 2025 +0100
Fix changelog for #3926
(cherry picked from commit 42fe2769db41aa1170276cd3893392b91a80f125)
---
...-idle-timeout-fix.yml => PR#3926-tika-server-idle-timeout-fix.yml} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/changelog/unreleased/tika-server-idle-timeout-fix.yml b/changelog/unreleased/PR#3926-tika-server-idle-timeout-fix.yml
similarity index 83%
rename from changelog/unreleased/tika-server-idle-timeout-fix.yml
rename to changelog/unreleased/PR#3926-tika-server-idle-timeout-fix.yml
index 36d2206609e..f114e4d21e3 100644
--- a/changelog/unreleased/tika-server-idle-timeout-fix.yml
+++ b/changelog/unreleased/PR#3926-tika-server-idle-timeout-fix.yml
@@ -5,5 +5,5 @@ authors:
- name: Jan Høydahl
url: https://home.apache.org/phonebook.html?uid=janhoy
links:
- - name: SOLR-XXXX
- url: https://issues.apache.org/jira/browse/SOLR-XXXX
+ - name: PR#3926
+ url: https://github.com/apache/solr/pull/3926