[pulsar] branch branch-2.7 updated: [Bookie] Fallback to PULSAR_GC if BOOKIE_GC is not defined (#9621)

[eo...@apache.org]

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

eolivelli pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 3937448  [Bookie] Fallback to PULSAR_GC if BOOKIE_GC is not defined (#9621)
3937448 is described below

commit 3937448fd2c5957218062f16053b8411e6e5867c
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Feb 19 18:56:14 2021 +0200

    [Bookie] Fallback to PULSAR_GC if BOOKIE_GC is not defined (#9621)
    
    - Currently Bookies fallback to PULSAR_MEM if BOOKIE_MEM isn't set (#6201).
      For consistency, it's useful to fallback to PULSAR_GC if BOOKIE_GC
      isn't set.
---
 conf/bkenv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 0e6a6ef..19e53a3 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -36,7 +36,7 @@ BOOKIE_CONF=${BOOKIE_CONF:-"$BK_HOME/conf/bookkeeper.conf"}
 BOOKIE_MEM=${BOOKIE_MEM:-${PULSAR_MEM:-"-Xms2g -Xmx2g -XX:MaxDirectMemorySize=2g"}}
 
 # Garbage collection options
-BOOKIE_GC=${BOOKIE_GC:-"-XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"}
+BOOKIE_GC=${BOOKIE_GC:-${PULSAR_GC:-"-XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"}}
 
 # Extra options to be passed to the jvm
 BOOKIE_EXTRA_OPTS="${BOOKIE_EXTRA_OPTS} ${BOOKIE_MEM} ${BOOKIE_GC} -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.maxCapacity.default=1000 -Dio.netty.recycler.linkCapacity=1024"