This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9_2
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_2 by this push:
new 2a5653f3d2d SOLR-16734: SOLR_DATA_HOME is only honored in verbode mode
(#1536)
2a5653f3d2d is described below
commit 2a5653f3d2dc2e3e51ad38cca38e8c453a2b877b
Author: Kevin Risden <[email protected]>
AuthorDate: Mon Apr 3 15:22:58 2023 -0400
SOLR-16734: SOLR_DATA_HOME is only honored in verbode mode (#1536)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8fea6fa650a..770448533ec 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -15,6 +15,8 @@ Bug Fixes
* SOLR-16728: Fix Classloading Exception for inter-node requests when using
SSL and HTTP2.
All Jetty classes are able to be shared between the Jetty server and webApp
now. (Houston Putman)
+* SOLR-16734: SOLR_DATA_HOME is only honored in verbode mode (Kevin Risden)
+
Other Changes
---------------------
* SOLR-16735: Allow custom configuration of Jetty's SecureRequestCustomizer
(Tomás Fernández Löbbe)
diff --git a/solr/bin/solr b/solr/bin/solr
index d4d6905bc25..f199da293e9 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -2191,6 +2191,10 @@ function start_solr() {
SOLR_OPTS+=("-DwaitForZk=$SOLR_WAIT_FOR_ZK")
fi
+ if [ -n "${SOLR_DATA_HOME:-}" ]; then
+ SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")
+ fi
+
# If SSL-related system props are set, add them to SOLR_OPTS
if [ "$SOLR_SSL_ENABLED" == "true" ]; then
# If using SSL and solr.jetty.https.port not set explicitly, use the
jetty.port
@@ -2252,7 +2256,6 @@ function start_solr() {
fi
if [ -n "${SOLR_DATA_HOME:-}" ]; then
- SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")
echo -e " SOLR_DATA_HOME = $SOLR_DATA_HOME"
fi
echo
