diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 61431497272..21996159f08 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -146,6 +146,8 @@ Other Changes * SOLR-9983: Fixing NullPointerException failure by TestManagedSchemaThreadSafety adding check for Zookeeper session expiration (Steve Rowe, Mikhail Khludnev) +* SOLR-10043: Reduce logging of pre-start log rotation (janhoy) + ================== 6.4.1 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/bin/solr b/solr/bin/solr index c2d0feba74c..cf9765d5625 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -1480,11 +1480,16 @@ if [ ! -e "$SOLR_HOME" ]; then echo -e "\nSolr home directory $SOLR_HOME not found!\n" exit 1 fi +if $verbose ; then + q="" +else + q="-q" +fi if [ "${SOLR_LOG_PRESTART_ROTATION:=true}" == "true" ]; then - run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" -remove_old_solr_logs 7 || echo "Failed removing old solr logs" - run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" -archive_gc_logs || echo "Failed archiving old GC logs" - run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" -archive_console_logs || echo "Failed archiving old console logs" - run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" -rotate_solr_logs 9 || echo "Failed rotating old solr logs" + run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" $q -remove_old_solr_logs 7 || echo "Failed removing old solr logs" + run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" $q -archive_gc_logs $q || echo "Failed archiving old GC logs" + run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" $q -archive_console_logs || echo "Failed archiving old console logs" + run_tool utils -s "$DEFAULT_SERVER_DIR" -l "$SOLR_LOGS_DIR" $q -rotate_solr_logs 9 || echo "Failed rotating old solr logs" fi java_ver_out=`echo "$("$JAVA" -version 2>&1)"` diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd index 65f2a5745f2..6cd0096f3cc 100644 --- a/solr/bin/solr.cmd +++ b/solr/bin/solr.cmd @@ -1219,10 +1219,12 @@ goto done :run_utils set "TOOL_CMD=%~1" +set q="-q" +IF "%verbose%"=="1" set q="" "%JAVA%" %SOLR_SSL_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^ -Dlog4j.configuration="file:%DEFAULT_SERVER_DIR%\scripts\cloud-scripts\log4j.properties" ^ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^ - org.apache.solr.util.SolrCLI utils -s "%DEFAULT_SERVER_DIR%" -l "%SOLR_LOGS_DIR%" %TOOL_CMD% + org.apache.solr.util.SolrCLI utils -s "%DEFAULT_SERVER_DIR%" -l "%SOLR_LOGS_DIR%" %q:"=% %TOOL_CMD% if errorlevel 1 ( exit /b 1 )