Apache Solr open-source search software
SOLR-16457: solr.data.home should not be set to empty string in bin/solr (#1066)
Kevin Risdenf4cca0d0a51d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ad2cb3e7976..65caae78648 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -211,6 +211,8 @@ Bug Fixes* SOLR-16229: Http2SolrClient aborts requests on exception (Daniel Rabus, Tomás Fernández Löbbe)+* SOLR-16457: solr.data.home should not be set to empty string in bin/solr (Kevin Risden)+Other Changes---------------------* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)diff --git a/solr/bin/solr b/solr/bin/solrindex d5fb182e05c..9373ee6d01e 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -2225,6 +2225,7 @@ function start_solr() {fiif [ -n "${SOLR_DATA_HOME:-}" ]; then+ SOLR_OPTS+=("-Dsolr.data.home=$SOLR_DATA_HOME")echo -e " SOLR_DATA_HOME = $SOLR_DATA_HOME"fiecho@@ -2245,7 +2246,7 @@ function start_solr() {# users who don't care about useful error msgs can override in SOLR_OPTS with +OmitStackTraceInFastThrow"${SOLR_HOST_ARG[@]}" "-Duser.timezone=$SOLR_TIMEZONE" "-XX:-OmitStackTraceInFastThrow" \"-XX:OnOutOfMemoryError=$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" \- "-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.data.home=${SOLR_DATA_HOME:-}" "-Dsolr.install.dir=$SOLR_TIP" \+ "-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.install.dir=$SOLR_TIP" \"-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}")mk_writable_dir "$SOLR_LOGS_DIR" "Logs"diff --git a/solr/docker/templates/Dockerfile.body.template b/solr/docker/templates/Dockerfile.body.templateindex 27ea08dc4a5..4177aa4b014 100644--- a/solr/docker/templates/Dockerfile.body.template+++ b/solr/docker/templates/Dockerfile.body.template@@ -45,6 +45,7 @@ ENV SOLR_USER="solr" \SOLR_PID_DIR=/var/solr \SOLR_LOGS_DIR=/var/solr/logs \LOG4J_PROPS=/var/solr/log4j2.xml \+ SOLR_SERVER_DIR="/opt/solr-${SOLR_VERSION}/server" \SOLR_JETTY_HOST="0.0.0.0"RUN set -ex; \diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policyindex b0a07d802a3..8681d1e3663 100644--- a/solr/server/etc/security.policy+++ b/solr/server/etc/security.policy@@ -27,6 +27,10 @@ grant {// system jar resourcespermission java.io.FilePermission "${java.home}${/}-", "read";+ // tmpdir+ permission java.io.FilePermission "${java.io.tmpdir}", "read,write";+ permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read,write,delete";+// Test launchers (randomizedtesting, etc.)permission java.io.FilePermission "${junit4.childvm.cwd}", "read";permission java.io.FilePermission "${junit4.childvm.cwd}${/}temp", "read,write,delete";