(solr) branch branch_9x updated: SOLR-16252 Server admins cannot override default value for UPDATE_TIMEOUT_SECS (#2061)

[st...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 3f96c45288e SOLR-16252 Server admins cannot override default value for UPDATE_TIMEOUT_SECS (#2061)
3f96c45288e is described below

commit 3f96c45288e0aa72456f944a2e0520ecb222d1eb
Author: Alex D <st...@apache.org>
AuthorDate: Wed Nov 8 10:10:56 2023 -0800

    SOLR-16252 Server admins cannot override default value for UPDATE_TIMEOUT_SECS (#2061)
    
    (cherry picked from commit 9bff25e4661c7b2c5eaa9cf376a049a6062b90e6)
---
 solr/core/src/java/org/apache/solr/schema/SchemaManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
index 801863fa882..53a3bbff40c 100644
--- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
+++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
@@ -68,8 +68,7 @@ public class SchemaManager {
     this.req = req;
 
     // The default timeout is 10 minutes when no BaseSolrResource.UPDATE_TIMEOUT_SECS is specified
-    int defaultUpdateTimeOut = 600;
-
+    int defaultUpdateTimeOut = Integer.getInteger("solr.schemaUpdateTimeoutSeconds", 600);
     updateTimeOut =
         req.getParams().getInt(BaseSolrResource.UPDATE_TIMEOUT_SECS, defaultUpdateTimeOut);