commit c9d8ecf2d7878cb1ecb7b10a1b2258c21b554445
author kijanowski <kijanowski@gmail.com> Thu Dec 23 09:59:19 2021 +0100
committer GitHub <noreply@github.com> Thu Dec 23 16:59:19 2021 +0800
tree da572779c2d94f53c40d04f59c153e25872fe2a1
parent 6c7dcc0cf877cfcb8bcea18cde7662ebacb01d4c

[Client]Allow to override PULSAR_MEM settings via PULSAR_EXTRA_OPS (#13381)

### Motivation

`pulsar-client` runs `conf/pulsar_tools_env.sh` to set `PULSAR_EXTRA_OPTS`. If `PULSAR_EXTRA_OPTS` are given in the command line and contain `-Xmx`, it will be overridden by `PULSAR_MEM`.

### Modifications

Exchange the order of applying env variables. First go the hardcoded PULSAR_MEM settings, then potentially the user settings.

conf/pulsar_tools_env.sh

diff --git a/conf/pulsar_tools_env.sh b/conf/pulsar_tools_env.sh
index 0f14977..f16bbca 100755
--- a/conf/pulsar_tools_env.sh
+++ b/conf/pulsar_tools_env.sh
@@ -48,7 +48,7 @@
 PULSAR_GC=" -client "
 
 # Extra options to be passed to the jvm
-PULSAR_EXTRA_OPTS="${PULSAR_EXTRA_OPTS} ${PULSAR_MEM} ${PULSAR_GC} ${PULSAR_GC_LOG} -Dio.netty.leakDetectionLevel=disabled"
+PULSAR_EXTRA_OPTS="${PULSAR_MEM} ${PULSAR_GC} ${PULSAR_GC_LOG} -Dio.netty.leakDetectionLevel=disabled ${PULSAR_EXTRA_OPTS}"
 
 # Add extra paths to the bookkeeper classpath
 # PULSAR_EXTRA_CLASSPATH=