Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17744: Change default SOLR_JETTY_GRACEFUL value to false

Chris Hostetter0fda63b788bb
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 87665948bdc..35447fc2fcb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -240,7 +240,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 be0389a5eef..ce85b4bbb85 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -301,7 +301,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