[pulsar] 06/06: Enable TCP/IP keepalive for all ZK client connections in all components (#15908)

[lh...@apache.org]

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

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

commit 77292ad49fcffab9ea0f3c8b70fdb6ddcf4f0f04
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Sat Jun 4 19:27:02 2022 +0300

    Enable TCP/IP keepalive for all ZK client connections in all components (#15908)
    
    (cherry picked from commit ede3d19399f5d58e5218a6e7bf1f86a2c44eadc9)
---
 bin/pulsar | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/pulsar b/bin/pulsar
index 43e137af531..f1067c07a3f 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -270,6 +270,8 @@ OPTS="$OPTS -Dlog4j.configurationFile=`basename $PULSAR_LOG_CONF`"
 # rarely needed when trying to list many z-nodes under a
 # directory)
 OPTS="$OPTS -Djute.maxbuffer=10485760 -Djava.net.preferIPv4Stack=true"
+# Enable TCP keepalive for all Zookeeper client connections
+OPTS="$OPTS -Dzookeeper.clientTcpKeepAlive=true"
 
 # Allow Netty to use reflection access
 OPTS="$OPTS -Dio.netty.tryReflectionSetAccessible=true"
@@ -311,7 +313,7 @@ OPTS="$OPTS -Dpulsar.functions.extra.dependencies.dir=${FUNCTIONS_EXTRA_DEPS_DIR
 OPTS="$OPTS -Dpulsar.functions.instance.classpath=${PULSAR_CLASSPATH}"
 OPTS="$OPTS -Dpulsar.functions.log.conf=${FUNCTIONS_LOG_CONF}"
 
-ZK_OPTS=" -Dzookeeper.4lw.commands.whitelist=* -Dzookeeper.snapshot.trust.empty=true -Dzookeeper.tcpKeepAlive=true -Dzookeeper.clientTcpKeepAlive=true"
+ZK_OPTS=" -Dzookeeper.4lw.commands.whitelist=* -Dzookeeper.snapshot.trust.empty=true -Dzookeeper.tcpKeepAlive=true"
 
 LOG4J2_SHUTDOWN_HOOK_DISABLED="-Dlog4j.shutdownHookEnabled=false"