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

lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new aff9ec872b3 [improve] Support overriding java.net.preferIPv4Stack with 
OPTS (#23846)
aff9ec872b3 is described below

commit aff9ec872b3f23aef90015dd9b81a8dccd6e9a07
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Tue Jan 14 04:38:22 2025 -0800

    [improve] Support overriding java.net.preferIPv4Stack with OPTS (#23846)
---
 bin/bookkeeper              | 2 +-
 bin/function-localrunner    | 2 +-
 bin/pulsar                  | 2 +-
 bin/pulsar-admin-common.cmd | 2 +-
 bin/pulsar-admin-common.sh  | 2 +-
 bin/pulsar-perf             | 2 +-
 src/pulsar-io-gen.sh        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/bookkeeper b/bin/bookkeeper
index ac7b622ac23..6be45bffdfa 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -201,7 +201,7 @@ OPTS="$OPTS --add-opens java.base/java.nio=ALL-UNNAMED 
--add-opens java.base/jdk
 OPTS="-cp $BOOKIE_CLASSPATH $OPTS"
 
 # Disable ipv6 as it can cause issues
-OPTS="$OPTS -Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS"
 
 OPTS="$OPTS $BOOKIE_MEM $BOOKIE_GC $BOOKIE_GC_LOG $BOOKIE_EXTRA_OPTS"
 
diff --git a/bin/function-localrunner b/bin/function-localrunner
index a47f3efa486..90971277906 100755
--- a/bin/function-localrunner
+++ b/bin/function-localrunner
@@ -131,7 +131,7 @@ fi
 # Ensure we can read bigger content from ZK. (It might be
 # rarely needed when trying to list many z-nodes under a
 # directory)
-OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS -Djute.maxbuffer=10485760"
 
 OPTS="-cp $PULSAR_CLASSPATH $OPTS"
 
diff --git a/bin/pulsar b/bin/pulsar
index 0125dd81e8b..25ac90769fb 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -273,7 +273,7 @@ OPTS="$OPTS -Dlog4j.configurationFile=`basename 
$PULSAR_LOG_CONF`"
 # Ensure we can read bigger content from ZK. (It might be
 # rarely needed when trying to list many z-nodes under a
 # directory)
-OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS -Djute.maxbuffer=10485760"
 # Enable TCP keepalive for all Zookeeper client connections
 OPTS="$OPTS -Dzookeeper.clientTcpKeepAlive=true"
 
diff --git a/bin/pulsar-admin-common.cmd b/bin/pulsar-admin-common.cmd
index c59f0e9b424..12d61b0cd63 100644
--- a/bin/pulsar-admin-common.cmd
+++ b/bin/pulsar-admin-common.cmd
@@ -60,7 +60,7 @@ for %%a in ("%PULSAR_LOG_CONF%") do SET 
"PULSAR_LOG_CONF_BASENAME=%%~nxa"
 set "PULSAR_CLASSPATH=%PULSAR_CLASSPATH%;%PULSAR_LOG_CONF_DIR%"
 
 set "OPTS=%OPTS% -Dlog4j.configurationFile="%PULSAR_LOG_CONF_BASENAME%""
-set "OPTS=%OPTS% -Djava.net.preferIPv4Stack=true"
+set "OPTS=-Djava.net.preferIPv4Stack=true %OPTS%"
 
 REM Allow Netty to use reflection access
 set "OPTS=%OPTS% -Dio.netty.tryReflectionSetAccessible=true"
diff --git a/bin/pulsar-admin-common.sh b/bin/pulsar-admin-common.sh
index 336ff43c1a8..d83408bdf8b 100755
--- a/bin/pulsar-admin-common.sh
+++ b/bin/pulsar-admin-common.sh
@@ -104,7 +104,7 @@ fi
 PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
 PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
 OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
-OPTS="$OPTS -Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS"
 
 # Allow Netty to use reflection access
 OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
diff --git a/bin/pulsar-perf b/bin/pulsar-perf
index 9108a42ef99..933fa3e6574 100755
--- a/bin/pulsar-perf
+++ b/bin/pulsar-perf
@@ -101,7 +101,7 @@ fi
 
 PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
 PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
-OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF` 
-Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS 
-Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
 
 # Allow Netty to use reflection access
 OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
diff --git a/src/pulsar-io-gen.sh b/src/pulsar-io-gen.sh
index a3083e8f2b5..9f5b1a6058c 100755
--- a/src/pulsar-io-gen.sh
+++ b/src/pulsar-io-gen.sh
@@ -108,7 +108,7 @@ fi
 
 
PULSAR_CLASSPATH="$PULSAR_JAR:$PULSAR_HOME/pulsar-io/docs/target/pulsar-io-docs.jar:$PULSAR_CLASSPATH:$PULSAR_EXTRA_CLASSPATH"
 PULSAR_CLASSPATH="`dirname $PULSAR_LOG_CONF`:$PULSAR_CLASSPATH"
-OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF` 
-Djava.net.preferIPv4Stack=true"
+OPTS="-Djava.net.preferIPv4Stack=true $OPTS 
-Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
 
 OPTS="-cp $PULSAR_CLASSPATH $OPTS"
 OPTS="$OPTS $PULSAR_EXTRA_OPTS"

Reply via email to