[solr] branch main updated: SOLR-11233: Add optional JAVA8_GC_LOG_FILE_OPTS for bin/solr. (#2284)

[cpoerschke]

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

cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 9eaefdf  SOLR-11233: Add optional JAVA8_GC_LOG_FILE_OPTS for bin/solr. 
(#2284)
9eaefdf is described below

commit 9eaefdf6b6178042bd26420fede08c0db65c45f3
Author: Christine Poerschke <cpoersc...@apache.org>
AuthorDate: Fri Mar 19 18:15:57 2021 +0000

    SOLR-11233: Add optional JAVA8_GC_LOG_FILE_OPTS for bin/solr. (#2284)
---
 solr/CHANGES.txt | 2 ++
 solr/bin/solr    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6bd4e42..7874004 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -277,6 +277,8 @@ Improvements
 
 * SOLR-15154: Let Http2SolrClient pass Basic Auth credentials to all requests 
(Tomás Fernández Löbbe)
 
+* SOLR-11233: Add optional JAVA8_GC_LOG_FILE_OPTS for bin/solr. (Pranav 
Murugappan, Christine Poerschke)
+
 Optimizations
 ---------------------
 * SOLR-15079: Block Collapse - Faster collapse code when groups are co-located 
via Block Join style nested doc indexing.
diff --git a/solr/bin/solr b/solr/bin/solr
index f6c723a..f28fb6c 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -2028,7 +2028,11 @@ if [ "$GC_LOG_OPTS" != "" ]; then
     if [ "$JAVA_VENDOR" == "IBM J9" ]; then
       gc_log_flag="-Xverbosegclog"
     fi
-    GC_LOG_OPTS+=("$gc_log_flag:$SOLR_LOGS_DIR/solr_gc.log" 
'-XX:+UseGCLogFileRotation' '-XX:NumberOfGCLogFiles=9' '-XX:GCLogFileSize=20M')
+    if [ -z ${JAVA8_GC_LOG_FILE_OPTS+x} ]; then
+      GC_LOG_OPTS+=("$gc_log_flag:$SOLR_LOGS_DIR/solr_gc.log" 
'-XX:+UseGCLogFileRotation' '-XX:NumberOfGCLogFiles=9' '-XX:GCLogFileSize=20M')
+    else
+      GC_LOG_OPTS+=($JAVA8_GC_LOG_FILE_OPTS)
+    fi
   else
     # http://openjdk.java.net/jeps/158
     for i in "${!GC_LOG_OPTS[@]}";