Apache Solr open-source search software
SOLR-16970: SOLR_OPTS should override most options (#1913)
Houston Putman676fd578db5d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 0099c2245fc..7f36982d3ab 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -119,6 +119,8 @@ ImprovementsThis will enable client and server hostName check settings to be governed by the same environment variable.If users want separate client/server settings, they can manually override the solr.jetty.ssl.sniHostCheck option in SOLR_OPTS. (Houston Putman)+* SOLR-16970: SOLR_OPTS is now able to override options set by the Solr control scripts, "bin/solr" and "bin/solr.cmd". (Houston Putman)+Optimizations---------------------diff --git a/solr/bin/solr b/solr/bin/solrindex 458421e0d1c..32a2465eccb 100644--- a/solr/bin/solr+++ b/solr/bin/solr@@ -628,7 +628,7 @@ function jetty_port() {function run_tool() {# shellcheck disable=SC2086- "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} -Dsolr.install.dir="$SOLR_TIP" \+ "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_ZK_CREDS_AND_ACLS:-} ${SOLR_TOOL_OPTS:-} -Dsolr.install.dir="$SOLR_TIP" \-Dlog4j.configurationFile="$DEFAULT_SERVER_DIR/resources/log4j2-console.xml" \-classpath "$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*:$DEFAULT_SERVER_DIR/lib/ext/*:$DEFAULT_SERVER_DIR/lib/*" \org.apache.solr.cli.SolrCLI "$@"@@ -742,7 +742,7 @@ function stop_solr() {if [ -n "$SOLR_PID" ]; thenecho -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting up to $SOLR_STOP_WAIT seconds to allow Jetty process $SOLR_PID to stop gracefully."# shellcheck disable=SC2086- "$JAVA" ${SOLR_TOOL_OPTS:-} $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true+ "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS ${SOLR_TOOL_OPTS:-} -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true(loops=0while truedo@@ -1222,6 +1222,7 @@ fiFG="false"FORCE=falseSOLR_OPTS=(${SOLR_OPTS:-})+SCRIPT_SOLR_OPTS=()PASS_TO_RUN_EXAMPLE=()if [ $# -gt 0 ]; then@@ -1370,6 +1371,7 @@ if [ $# -gt 0 ]; thenbreak # out-of-args, stop loopingelif [ "${1:0:2}" == "-D" ]; then# pass thru any opts that begin with -D (java system props)+ # These should go to the end of SOLR_OPTS, as they should override everything elseSOLR_OPTS+=("$1")PASS_TO_RUN_EXAMPLE+=("$1")shift@@ -1388,20 +1390,20 @@ fi# Solr modules optionif [[ -n "${SOLR_MODULES:-}" ]] ; then- SOLR_OPTS+=("-Dsolr.modules=$SOLR_MODULES")+ SCRIPT_SOLR_OPTS+=("-Dsolr.modules=$SOLR_MODULES")fi# Default placement pluginif [[ -n "${SOLR_PLACEMENTPLUGIN_DEFAULT:-}" ]] ; then- SOLR_OPTS+=("-Dsolr.placementplugin.default=$SOLR_PLACEMENTPLUGIN_DEFAULT")+ SCRIPT_SOLR_OPTS+=("-Dsolr.placementplugin.default=$SOLR_PLACEMENTPLUGIN_DEFAULT")fi# Remote streaming and stream bodyif [ "${SOLR_ENABLE_REMOTE_STREAMING:-false}" == "true" ]; then- SOLR_OPTS+=("-Dsolr.enableRemoteStreaming=true")+ SCRIPT_SOLR_OPTS+=("-Dsolr.enableRemoteStreaming=true")fiif [ "${SOLR_ENABLE_STREAM_BODY:-false}" == "true" ]; then- SOLR_OPTS+=("-Dsolr.enableStreamBody=true")+ SCRIPT_SOLR_OPTS+=("-Dsolr.enableStreamBody=true")fi: ${SOLR_SERVER_DIR:=$DEFAULT_SERVER_DIR}@@ -1494,15 +1496,15 @@ if [[ "$SCRIPT_CMD" == "stop" ]]; thenfiif [ -n "${SOLR_PORT_ADVERTISE:-}" ]; then- SOLR_OPTS+=("-Dsolr.port.advertise=$SOLR_PORT_ADVERTISE")+ SCRIPT_SOLR_OPTS+=("-Dsolr.port.advertise=$SOLR_PORT_ADVERTISE")fiif [ -n "${SOLR_JETTY_HOST:-}" ]; then- SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")+ SCRIPT_SOLR_OPTS+=("-Dsolr.jetty.host=$SOLR_JETTY_HOST")fiif [ -n "${SOLR_ZK_EMBEDDED_HOST:-}" ]; then- SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")+ SCRIPT_SOLR_OPTS+=("-Dsolr.zk.embedded.host=$SOLR_ZK_EMBEDDED_HOST")fi: "${STOP_PORT:=$((SOLR_PORT - 1000))}"@@ -1736,8 +1738,8 @@ elseJAVA_MEM_OPTS=("-Xms$SOLR_HEAP" "-Xmx$SOLR_HEAP")fi-# Pick default for Java thread stack size, and then add to SOLR_OPTS-SOLR_OPTS+=(${SOLR_JAVA_STACK_SIZE:-"-Xss256k"})+# Pick default for Java thread stack size, and then add to SCRIPT_SOLR_OPTS+SCRIPT_SOLR_OPTS+=(${SOLR_JAVA_STACK_SIZE:-"-Xss256k"}): "${SOLR_TIMEZONE:=UTC}"@@ -1778,79 +1780,83 @@ function start_solr() {fiif [ -n "${SOLR_WAIT_FOR_ZK:-}" ]; then- SOLR_OPTS+=("-DwaitForZk=$SOLR_WAIT_FOR_ZK")+ SCRIPT_SOLR_OPTS+=("-DwaitForZk=$SOLR_WAIT_FOR_ZK")fiif [ -n "${SOLR_DATA_HOME:-}" ]; then- SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")+ SCRIPT_SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")fiif [ -n "${SOLR_DELETE_UNKNOWN_CORES:-}" ]; then- SOLR_OPTS+=("-Dsolr.deleteUnknownCores=$SOLR_DELETE_UNKNOWN_CORES")+ SCRIPT_SOLR_OPTS+=("-Dsolr.deleteUnknownCores=$SOLR_DELETE_UNKNOWN_CORES")fi- # If SSL-related system props are set, add them to SOLR_OPTS+ # If SSL-related system props are set, add them to SCRIPT_SOLR_OPTSif [ "$SOLR_SSL_ENABLED" == "true" ]; then# If using SSL and solr.jetty.https.port not set explicitly, use the jetty.portSSL_PORT_PROP="-Dsolr.jetty.https.port=$SOLR_PORT"- SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")+ SCRIPT_SOLR_OPTS+=($SOLR_SSL_OPTS "$SSL_PORT_PROP")fi- # If authentication system props are set, add them to SOLR_OPTS+ # If authentication system props are set, add them to SCRIPT_SOLR_OPTSif [ -n "$AUTHC_OPTS" ]; then- SOLR_OPTS+=($AUTHC_OPTS)+ SCRIPT_SOLR_OPTS+=($AUTHC_OPTS)fi- # If there are internal options set by Solr (users should not use this variable), add them to SOLR_OPTS+ # If there are internal options set by Solr (users should not use this variable), add them to SCRIPT_SOLR_OPTSif [ -n "$SOLR_OPTS_INTERNAL" ]; then- SOLR_OPTS+=($SOLR_OPTS_INTERNAL)+ SCRIPT_SOLR_OPTS+=($SOLR_OPTS_INTERNAL)fi- # If a heap dump directory is specified, enable it in SOLR_OPTS+ # If a heap dump directory is specified, enable it in SCRIPT_SOLR_OPTSif [[ -z "${SOLR_HEAP_DUMP_DIR:-}" ]] && [[ "${SOLR_HEAP_DUMP:-}" == "true" ]]; thenSOLR_HEAP_DUMP_DIR="${SOLR_LOGS_DIR}/dumps"fiif [[ -n "${SOLR_HEAP_DUMP_DIR:-}" ]]; then- SOLR_OPTS+=("-XX:+HeapDumpOnOutOfMemoryError")- SOLR_OPTS+=("-XX:HeapDumpPath=$SOLR_HEAP_DUMP_DIR/solr-$(date +%s)-pid$$.hprof")+ SCRIPT_SOLR_OPTS+=("-XX:+HeapDumpOnOutOfMemoryError")+ SCRIPT_SOLR_OPTS+=("-XX:HeapDumpPath=$SOLR_HEAP_DUMP_DIR/solr-$(date +%s)-pid$$.hprof")fiif $verbose ; thenecho -e "\nStarting Solr using the following settings:"- echo -e " JAVA = $JAVA"- echo -e " SOLR_SERVER_DIR = $SOLR_SERVER_DIR"- echo -e " SOLR_HOME = $SOLR_HOME"- echo -e " SOLR_HOST = ${SOLR_HOST:-}"- echo -e " SOLR_PORT = $SOLR_PORT"- echo -e " STOP_PORT = $STOP_PORT"- echo -e " JAVA_MEM_OPTS = ${JAVA_MEM_OPTS[*]}"- echo -e " GC_TUNE = ${GC_TUNE_ARR[*]}"- echo -e " GC_LOG_OPTS = ${GC_LOG_OPTS[*]}"- echo -e " SOLR_TIMEZONE = $SOLR_TIMEZONE"+ echo -e " JAVA = $JAVA"+ echo -e " SOLR_SERVER_DIR = $SOLR_SERVER_DIR"+ echo -e " SOLR_HOME = $SOLR_HOME"+ echo -e " SOLR_HOST = ${SOLR_HOST:-}"+ echo -e " SOLR_PORT = $SOLR_PORT"+ echo -e " STOP_PORT = $STOP_PORT"+ echo -e " JAVA_MEM_OPTS = ${JAVA_MEM_OPTS[*]}"+ echo -e " GC_TUNE = ${GC_TUNE_ARR[*]}"+ echo -e " GC_LOG_OPTS = ${GC_LOG_OPTS[*]}"+ echo -e " SOLR_TIMEZONE = $SOLR_TIMEZONE"if [ "$SOLR_MODE" == "solrcloud" ]; then- echo -e " CLOUD_MODE_OPTS = ${CLOUD_MODE_OPTS[*]}"+ echo -e " CLOUD_MODE_OPTS = ${CLOUD_MODE_OPTS[*]}"fiif [ -n "${SOLR_OPTS:-}" ]; then- echo -e " SOLR_OPTS = ${SOLR_OPTS[*]}"+ echo -e " SOLR_OPTS (USER) = ${SOLR_OPTS[*]}"+ fi++ if [ -n "${SCRIPT_SOLR_OPTS:-}" ]; then+ echo -e " SOLR_OPTS (SCRIPT) = ${SCRIPT_SOLR_OPTS[*]}"fiif [ -n "${SOLR_ADDL_ARGS:-}" ]; then- echo -e " SOLR_ADDL_ARGS = $SOLR_ADDL_ARGS"+ echo -e " SOLR_ADDL_ARGS = $SOLR_ADDL_ARGS"fiif [ "${ENABLE_REMOTE_JMX_OPTS:-false}" == "true" ]; then- echo -e " RMI_PORT = ${RMI_PORT:-}"- echo -e " REMOTE_JMX_OPTS = ${REMOTE_JMX_OPTS[*]}"+ echo -e " RMI_PORT = ${RMI_PORT:-}"+ echo -e " REMOTE_JMX_OPTS = ${REMOTE_JMX_OPTS[*]}"fiif [ -n "${SOLR_LOG_LEVEL:-}" ]; then- echo -e " SOLR_LOG_LEVEL = $SOLR_LOG_LEVEL"+ echo -e " SOLR_LOG_LEVEL = $SOLR_LOG_LEVEL"fiif [ -n "${SOLR_DATA_HOME:-}" ]; then- echo -e " SOLR_DATA_HOME = $SOLR_DATA_HOME"+ echo -e " SOLR_DATA_HOME = $SOLR_DATA_HOME"fiechofi@@ -1865,14 +1871,14 @@ function start_solr() {# Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463if [[ "$JAVA_VER_NUM" -ge "17" ]] ; then- SOLR_OPTS+=("-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put")+ SCRIPT_SOLR_OPTS+=("-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put")echo "Java $JAVA_VER_NUM detected. Enabled workaround for SOLR-16463"fi# Vector optimizations are only supported for Java 20 and 21 for now.# This will need to change as Lucene is upgraded and newer Java versions are releasedif [[ "$JAVA_VER_NUM" -ge "20" ]] && [[ "$JAVA_VER_NUM" -le "21" ]] ; then- SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")+ SCRIPT_SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")echo "Java $JAVA_VER_NUM detected. Incubating Panama Vector APIs have been enabled"fi@@ -1886,7 +1892,7 @@ function start_solr() {# OOME is thrown. Program operation after OOME is unpredictable."-XX:+CrashOnOutOfMemoryError" "-XX:ErrorFile=${SOLR_LOGS_DIR}/jvm_crash_%p.log" \"-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.install.dir=$SOLR_TIP" "-Dsolr.install.symDir=$SOLR_TIP_SYM" \- "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}")+ "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SCRIPT_SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}" "${SOLR_OPTS[@]}")mk_writable_dir "$SOLR_LOGS_DIR" "Logs"if [[ -n "${SOLR_HEAP_DUMP_DIR:-}" ]]; thendiff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 93f1aaa17fd..572204b8f8b 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -805,22 +805,24 @@ IF NOT "%SOLR_HOST%"=="" (set SOLR_HOST_ARG=)+set SCRIPT_SOLR_OPTS=+REM Solr modules optionIF DEFINED SOLR_MODULES (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.modules=%SOLR_MODULES%"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.modules=%SOLR_MODULES%")REM Default placement pluginIF DEFINED SOLR_PLACEMENTPLUGIN_DEFAULT (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.placementplugin.default=%SOLR_PLACEMENTPLUGIN_DEFAULT%"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.placementplugin.default=%SOLR_PLACEMENTPLUGIN_DEFAULT%")REM Remote streaming and stream bodyIF "%SOLR_ENABLE_REMOTE_STREAMING%"=="true" (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.enableRemoteStreaming=true"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.enableRemoteStreaming=true")IF "%SOLR_ENABLE_STREAM_BODY%"=="true" (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.enableStreamBody=true"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.enableStreamBody=true")IF "%SOLR_SERVER_DIR%"=="" set "SOLR_SERVER_DIR=%DEFAULT_SERVER_DIR%"@@ -923,7 +925,7 @@ IF "%SCRIPT_CMD%"=="stop" (set found_it=1@echo Stopping Solr process %%N running on port %SOLR_PORT%IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop+ "%JAVA%" %SOLR_SSL_OPTS% %SOLR_TOOL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stopdel "%SOLR_TIP%"\bin\solr-%SOLR_PORT%.portREM wait for the process to terminateCALL :wait_for_process_exit %%N !SOLR_STOP_WAIT!@@ -948,15 +950,15 @@ IF "%SOLR_PORT%"=="" set SOLR_PORT=8983IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000IF DEFINED SOLR_PORT_ADVERTISE (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.port.advertise=%SOLR_PORT_ADVERTISE%"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.port.advertise=%SOLR_PORT_ADVERTISE%")IF DEFINED SOLR_JETTY_HOST (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.jetty.host=%SOLR_JETTY_HOST%")IF DEFINED SOLR_ZK_EMBEDDED_HOST (- set "SOLR_OPTS=%SOLR_OPTS% -Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%"+ set "SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -Dsolr.zk.embedded.host=%SOLR_ZK_EMBEDDED_HOST%")IF "%SCRIPT_CMD%"=="start" (@@ -1097,7 +1099,7 @@ IF "%SOLR_ADMIN_UI_DISABLED%"=="true" (IF NOT "%SOLR_HEAP%"=="" set SOLR_JAVA_MEM=-Xms%SOLR_HEAP% -Xmx%SOLR_HEAP%IF "%SOLR_JAVA_MEM%"=="" set SOLR_JAVA_MEM=-Xms512m -Xmx512mIF "%SOLR_JAVA_STACK_SIZE%"=="" set SOLR_JAVA_STACK_SIZE=-Xss256k-set SOLR_OPTS=%SOLR_JAVA_STACK_SIZE% %SOLR_OPTS%+set SCRIPT_SOLR_OPTS=%SOLR_JAVA_STACK_SIZE% %SCRIPT_SOLR_OPTS%IF "%SOLR_TIMEZONE%"=="" set SOLR_TIMEZONE=UTCIF "%GC_TUNE%"=="" (@@ -1112,14 +1114,14 @@ IF "%GC_TUNE%"=="" (REM Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463if !JAVA_MAJOR_VERSION! GEQ 17 (- set SOLR_OPTS=%SOLR_OPTS% -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put+ set SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% -XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::putecho Java %JAVA_MAJOR_VERSION% detected. Enabled workaround for SOLR-16463)REM Vector optimizations are only supported for Java 20 and 21 for now.REM This will need to change as Lucene is upgraded and newer Java versions are releasedif !JAVA_MAJOR_VERSION! GEQ 20 if !JAVA_MAJOR_VERSION! LEQ 21 (- set SOLR_OPTS=%SOLR_OPTS% --add-modules jdk.incubator.vector+ set SCRIPT_SOLR_OPTS=%SCRIPT_SOLR_OPTS% --add-modules jdk.incubator.vectorecho Java %JAVA_MAJOR_VERSION% detected. Incubating Panama Vector APIs have been enabled)@@ -1149,44 +1151,48 @@ if !JAVA_MAJOR_VERSION! GEQ 9 if NOT "%JAVA_VENDOR%" == "OpenJ9" (IF "%verbose%"=="1" (@echo Starting Solr using the following settings:- CALL :safe_echo " JAVA = %JAVA%"- CALL :safe_echo " SOLR_SERVER_DIR = %SOLR_SERVER_DIR%"- CALL :safe_echo " SOLR_HOME = %SOLR_HOME%"- @echo SOLR_HOST = %SOLR_HOST%- @echo SOLR_PORT = %SOLR_PORT%- @echo STOP_PORT = %STOP_PORT%- @echo SOLR_JAVA_MEM = %SOLR_JAVA_MEM%- @echo GC_TUNE = !GC_TUNE!- @echo GC_LOG_OPTS = %GC_LOG_OPTS%- @echo SOLR_TIMEZONE = %SOLR_TIMEZONE%+ CALL :safe_echo " JAVA = %JAVA%"+ CALL :safe_echo " SOLR_SERVER_DIR = %SOLR_SERVER_DIR%"+ CALL :safe_echo " SOLR_HOME = %SOLR_HOME%"+ @echo SOLR_HOST = %SOLR_HOST%+ @echo SOLR_PORT = %SOLR_PORT%+ @echo STOP_PORT = %STOP_PORT%+ @echo SOLR_JAVA_MEM = %SOLR_JAVA_MEM%+ @echo GC_TUNE = !GC_TUNE!+ @echo GC_LOG_OPTS = %GC_LOG_OPTS%+ @echo SOLR_TIMEZONE = %SOLR_TIMEZONE%IF "%SOLR_MODE%"=="solrcloud" (- @echo CLOUD_MODE_OPTS = %CLOUD_MODE_OPTS%+ @echo CLOUD_MODE_OPTS = %CLOUD_MODE_OPTS%)IF NOT "%SOLR_OPTS%"=="" (- @echo SOLR_OPTS = %SOLR_OPTS%+ @echo SOLR_OPTS (USER) = %SOLR_OPTS%+ )++ IF NOT "%SCRIPT_SOLR_OPTS%"=="" (+ @echo SOLR_OPTS (SCRIPT) = %SCRIPT_SOLR_OPTS%)IF NOT "%SOLR_ADDL_ARGS%"=="" (- CALL :safe_echo " SOLR_ADDL_ARGS = %SOLR_ADDL_ARGS%"+ CALL :safe_echo " SOLR_ADDL_ARGS = %SOLR_ADDL_ARGS%")IF NOT "%SOLR_JETTY_ADDL_CONFIG%"=="" (- CALL :safe_echo " SOLR_JETTY_ADDL_CONFIG = %SOLR_JETTY_ADDL_CONFIG%"+ CALL :safe_echo " SOLR_JETTY_ADDL_CONFIG = %SOLR_JETTY_ADDL_CONFIG%")IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (- @echo RMI_PORT = !RMI_PORT!- @echo REMOTE_JMX_OPTS = %REMOTE_JMX_OPTS%+ @echo RMI_PORT = !RMI_PORT!+ @echo REMOTE_JMX_OPTS = %REMOTE_JMX_OPTS%)IF NOT "%SOLR_LOG_LEVEL%"=="" (- @echo SOLR_LOG_LEVEL = !SOLR_LOG_LEVEL!+ @echo SOLR_LOG_LEVEL = !SOLR_LOG_LEVEL!)IF NOT "%SOLR_DATA_HOME%"=="" (- @echo SOLR_DATA_HOME = !SOLR_DATA_HOME!+ @echo SOLR_DATA_HOME = !SOLR_DATA_HOME!)@echo.@@ -1207,7 +1213,7 @@ IF NOT "!IP_ACL_OPTS!"=="" set "START_OPTS=%START_OPTS% !IP_ACL_OPTS!"IF NOT "%REMOTE_JMX_OPTS%"=="" set "START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%"IF NOT "%SOLR_ADDL_ARGS%"=="" set "START_OPTS=%START_OPTS% %SOLR_ADDL_ARGS%"IF NOT "%SOLR_HOST_ARG%"=="" set "START_OPTS=%START_OPTS% %SOLR_HOST_ARG%"-IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"+IF NOT "%SCRIPT_SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SCRIPT_SOLR_OPTS%"IF NOT "%SOLR_OPTS_INTERNAL%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS_INTERNAL%"IF NOT "!SECURITY_MANAGER_OPTS!"=="" set "START_OPTS=%START_OPTS% !SECURITY_MANAGER_OPTS!"IF "%SOLR_SSL_ENABLED%"=="true" (@@ -1223,6 +1229,9 @@ set "START_OPTS=%START_OPTS% -Dsolr.log.dir=%SOLR_LOGS_DIR_QUOTED% -Djava.util.lIF NOT "%SOLR_DATA_HOME%"=="" set "START_OPTS=%START_OPTS% -Dsolr.data.home=%SOLR_DATA_HOME_QUOTED%"IF NOT DEFINED LOG4J_CONFIG set "LOG4J_CONFIG=%SOLR_SERVER_DIR%\resources\log4j2.xml"+REM This should be the last thing added to START_OPTS, so that users can override as much as possible+IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"+cd /d "%SOLR_SERVER_DIR%"IF NOT EXIST "%SOLR_LOGS_DIR%" (@@ -1272,7 +1281,7 @@ IF "%FG%"=="1" (set SOLR_START_WAIT=30)REM now wait to see Solr come online ...- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI status -maxWaitSecs !SOLR_START_WAIT! -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:%SOLR_PORT%/solr@@ -1287,7 +1296,7 @@ goto done:run_exampleREM Run the requested example-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-Dsolr.install.symDir="%SOLR_TIP%" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^@@ -1311,7 +1320,7 @@ for /f "usebackq" %%i in (`dir /b "%SOLR_TIP%\bin" ^| findstr /i "^solr-.*\.portset has_info=1echo Found Solr process %%k running on port !SOME_SOLR_PORT!REM Passing in %2 (-h or -help) directly is captured by a custom help path for usage output- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI status -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!SOME_SOLR_PORT!/solr %2@@ -1326,7 +1335,7 @@ set has_info=goto done:run_solrcli-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI %*@@ -1475,7 +1484,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="The -d option must be set for upconfig."goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%^@@ -1489,7 +1498,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="The -d option must be set for downconfig."goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%@@ -1508,7 +1517,7 @@ IF "!ZK_OP!"=="upconfig" (goto zk_short_usage))- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! -recurse !ZK_RECURSE! %ZK_VERBOSE%@@ -1521,7 +1530,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="<dest> must be specified for 'mv' command"goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! %ZK_VERBOSE%@@ -1530,7 +1539,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="Zookeeper path to remove must be specified when using the 'rm' command"goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%@@ -1539,7 +1548,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="Zookeeper path to remove must be specified when using the 'ls' command"goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%@@ -1548,7 +1557,7 @@ IF "!ZK_OP!"=="upconfig" (set ERROR_MSG="Zookeeper path to create must be specified when using the 'mkroot' command"goto zk_short_usage)- "%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+ "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%SOLR_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! %ZK_VERBOSE%@@ -1609,7 +1618,7 @@ if "!AUTH_PORT!"=="" ()))-"%JAVA%" %SOLR_TOOL_OPTS% %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^+"%JAVA%"Ω %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% %SOLR_TOOL_OPTS% -Dsolr.install.dir="%SOLR_TIP%" ^-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^org.apache.solr.cli.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^