This is an automated email from the ASF dual-hosted git repository.
hossman 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 35db065e2a9 SOLR-17744: Change default SOLR_JETTY_GRACEFUL value to
false
35db065e2a9 is described below
commit 35db065e2a987f37e037aef0c8efda23d7ee3cb7
Author: Chris Hostetter <[email protected]>
AuthorDate: Mon Jun 23 10:42:01 2025 -0700
SOLR-17744: Change default SOLR_JETTY_GRACEFUL value to false
Based on test failures noted in SOLR-17764, the implications of what this
might mean for some SolrJ users, and a lack of concensus on how to move
forward, I'm changing this defualt to minimize the risk of impact on users when
upgrading
(cherry picked from commit 0fda63b788bbd232039f079d1ccd3ac452b29b85)
---
solr/CHANGES.txt | 3 ++-
solr/bin/solr | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 228a0ce6df8..54b11b6d39c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -51,7 +51,8 @@ Improvements
* SOLR-17732: Score-based return fields other than "score" can now be returned
in distributed queries. (Houston Putman)
-* SOLR-17744: Solr now enables Jetty's Graceful Shutdown features to prevent
client connections from being abruptly terminated on orderly shutdown (hossman)
+* SOLR-17744: Solr now supports Jetty's Graceful Shutdown module (via
SOLR_JETTY_GRACEFUL=true) to prevent client connections from being
+ abruptly terminated on orderly shutdown (hossman)
* SOLR-17187: The polling interval for PULL and TLOG replicas can now be
overridden using the `commitPollInterval` setting, which takes a String
formatted as "HH:mm:ss" (Torsten Koster via Christine Poerschke, Jason
Gerlowski)
diff --git a/solr/bin/solr b/solr/bin/solr
index 648fccd7b23..4dc5de351ca 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -305,7 +305,7 @@ fi
export SOLR_URL_SCHEME
# Gracefully wait for existing requests on shutdown
-if [ "${SOLR_JETTY_GRACEFUL:-true}" == "true" ]; then
+if [ "${SOLR_JETTY_GRACEFUL:-false}" == "true" ]; then
SOLR_JETTY_CONFIG+=("--module=graceful")
fi
