[lucene-solr] branch reference_impl updated: @1308 Start in fg borked due to empty gc env variable.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl by this push:
     new a1fc17d  @1308 Start in fg borked due to empty gc env variable.
a1fc17d is described below

commit a1fc17de1cc69786a5673ad29bf40bfa2d6d377f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Feb 2 17:05:10 2021 -0600

    @1308 Start in fg borked due to empty gc env variable.
---
 solr/bin/solr                                      | 8 ++++----
 solr/reference-branch/docker/solr-image/Dockerfile | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index e953541..f925570 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -190,7 +190,6 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
     echo >&2 "HTTP/2 + SSL is not support in Java 8. "
     echo >&2 "Configure Solr with HTTP/1.1 + SSL"
     SOLR_JETTY_CONFIG+=("--module=https8")
-    SOLR_JETTY_CONFIG+=("--module=https8")
   else
     SOLR_JETTY_CONFIG+=("--module=https")
   fi
@@ -1939,7 +1938,7 @@ if [ -z ${GC_LOG_OPTS+x} ]; then
                  '-XX:+PrintGCDateStamps' '-XX:+PrintGCTimeStamps' '-XX:+PrintTenuringDistribution' \
                  '-XX:+PrintGCApplicationStoppedTime')
   else
-    GC_LOG_OPTS=('')
+    GC_LOG_OPTS=('-Dno_gc_logging')
   fi
 else
   GC_LOG_OPTS=($GC_LOG_OPTS)
@@ -2030,6 +2029,7 @@ else
 fi
 
 # Enable java security manager (allowing filesystem access and other things)
+# MRM TODO: enable security manager
 if [ "${SOLR_SECURITY_MANAGER_ENABLED:-false}" == "true" ]; then
   SECURITY_MANAGER_OPTS=('-Djava.security.manager' \
       "-Djava.security.policy=${SOLR_SERVER_DIR}/etc/security.policy" \
@@ -2214,14 +2214,14 @@ function start_solr() {
   fi
 
   if [ "$run_in_foreground" == "true" ]; then
-    exec "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -XX:-UseBiasedLocking -jar start.jar "${SOLR_JETTY_CONFIG[@]}" $SOLR_JETTY_ADDL_CONFIG
+    exec "$JAVA" -Djetty.state="${SOLR_HOME}"/jetty.state "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -XX:-UseBiasedLocking -Dsolr.log.muteconsole -jar start.jar "${SOLR_JETTY_CONFIG[@]}" $SOLR_JETTY_ADDL_CONFIG
   else
     # run Solr in the background
     export JAVA=$JAVA
     export JETTY_HOME="$SOLR_SERVER_DIR"
     export JETTY_PID="$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
     export JETTY_ARGS="${SOLR_JETTY_CONFIG[@]} $SOLR_JETTY_ADDL_CONFIG"
-    export JAVA_OPTIONS="-Djetty.state=${SOLR_HOME}/jetty.state ${SOLR_START_OPTS[@]} $SOLR_ADDL_ARGS -XX:-UseBiasedLocking -Dsolr.log.muteconsole"
+    export JAVA_OPTIONS="${SOLR_START_OPTS[@]} $SOLR_ADDL_ARGS -XX:-UseBiasedLocking -Dsolr.log.muteconsole"
     export JETTY_STATE="${SOLR_HOME}/jetty.state"
     bash $SOLR_SERVER_DIR/../bin/jetty.sh start
   fi
diff --git a/solr/reference-branch/docker/solr-image/Dockerfile b/solr/reference-branch/docker/solr-image/Dockerfile
index 88f7db4..3f610ba 100644
--- a/solr/reference-branch/docker/solr-image/Dockerfile
+++ b/solr/reference-branch/docker/solr-image/Dockerfile
@@ -13,9 +13,10 @@ RUN chmod +x /start-solr.sh
 RUN apt-get -y update; apt-get -y upgrade; apt-get -y install git
 
 RUN cd "${BUILD_DIR}"; git clone https://github.com/apache/lucene-solr.git --branch reference_impl --single-branch reference_impl; \
-cd "${BUILD_DIR}/reference_impl"; ./gradlew -p solr distTar; -Dversion=9.0.0-miller_ref_impl; \
-cp -r packaging/*miller_ref_impl/* /opt/solr; chmod +x /opt/solr/bin/solr; \
-rm -r /root/.m2; \
+cd "${BUILD_DIR}/reference_impl"; ./gradlew -p solr distTar; \
+#cp -r packaging/*solr-*/* /opt/solr; chmod +x /opt/solr/bin/solr; \
+cp -r "${BUILD_DIR}"/reference_impl/solr/packaging/build/distributions/solr-*.tgz /opt/solr; \
+rm -rf /root/.m2; rm -rf /root/.ivy2; \
 #rm -r "${BUILD_DIR}"; \
 apt-get -y remove git; apt -y autoclean; apt -y autoremove