[lucene-solr] 02/02: @1293 oom script does not work correctly with args yet.

[ma...@apache.org]

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

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

commit e427ba45047ffb235d461831d746c0c36c83e9ad
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Jan 29 21:09:28 2021 -0600

    @1293 oom script does not work correctly with args yet.
---
 solr/bin/jetty.sh | 2 +-
 solr/bin/solr     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/solr/bin/jetty.sh b/solr/bin/jetty.sh
index f9b3f53..677d5e4 100644
--- a/solr/bin/jetty.sh
+++ b/solr/bin/jetty.sh
@@ -495,7 +495,7 @@ case "$ACTION" in
     then
       echo "OK `date`"
     else
-      echo "FAILED `date`"
+      echo -e "FAILED `date`\n startup cmd=${RUN_CMD[*]}"
       exit 1
     fi
 
diff --git a/solr/bin/solr b/solr/bin/solr
index e5d042b..e953541 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -871,7 +871,7 @@ function stop_solr() {
 
   TIMEOUT=30
   while running $PID; do
-    if (( TIMEOUT-- =< 0 )); then
+    if (( TIMEOUT-- <= 0 )); then
        echo "Timed out waiting for Solr shutdown, killing ${PID}"
        kill -KILL "$PID" 2>/dev/null
     fi
@@ -2191,7 +2191,7 @@ function start_solr() {
     # '-OmitStackTraceInFastThrow' ensures stack traces in errors,
     # 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" \
+    # MRM TODO: this is hard to deref properly with arguments "-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" \
     "-Dorg.apache.xml.dtm.DTMManager=org.apache.xml.dtm.ref.DTMManagerDefault -Djava.net.preferIPv4Stack=true -Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}" "${SOLR_ADMIN_UI}")
 
@@ -2221,7 +2221,7 @@ function start_solr() {
     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 -XX:OnOutOfMemoryError=$SOLR_TIP/bin/oom_solr.sh"
+    export JAVA_OPTIONS="-Djetty.state=${SOLR_HOME}/jetty.state ${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