From acf502c67dc1ec8ec8c4a6243497cd7908533bdb Mon Sep 17 00:00:00 2001 From: Steffen Moldenhauer Date: Fri, 8 Sep 2023 14:56:19 +0200 Subject: [PATCH 1/2] ZOOKEEPER-4391: Unable to use newer JVM memory settings as Xmx overrides --- bin/zkEnv.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bin/zkEnv.sh b/bin/zkEnv.sh index 40889874818..9e256441ffa 100755 --- a/bin/zkEnv.sh +++ b/bin/zkEnv.sh @@ -136,8 +136,16 @@ export CLASSPATH # default heap for zookeeper server ZK_SERVER_HEAP="${ZK_SERVER_HEAP:-1000}" -export SERVER_JVMFLAGS="-Xmx${ZK_SERVER_HEAP}m $SERVER_JVMFLAGS" +if [[ ${ZK_SERVER_HEAP} =~ ^[0-9]+.*[0-9]+$ ]]; then + export SERVER_JVMFLAGS="-Xmx${ZK_SERVER_HEAP}m $SERVER_JVMFLAGS" +else + export SERVER_JVMFLAGS="${ZK_SERVER_HEAP} $SERVER_JVMFLAGS" +fi # default heap for zookeeper client ZK_CLIENT_HEAP="${ZK_CLIENT_HEAP:-256}" -export CLIENT_JVMFLAGS="-Xmx${ZK_CLIENT_HEAP}m $CLIENT_JVMFLAGS" +if [[ ${ZK_CLIENT_HEAP} =~ ^[0-9]+.*[0-9]+$ ]]; then + export CLIENT_JVMFLAGS="-Xmx${ZK_CLIENT_HEAP}m $CLIENT_JVMFLAGS" +else + export CLIENT_JVMFLAGS="${ZK_CLIENT_HEAP} $CLIENT_JVMFLAGS" +fi From 7e73a385915a440aaa684648f2944641dda226bb Mon Sep 17 00:00:00 2001 From: Steffen Moldenhauer Date: Wed, 1 Oct 2025 16:19:18 +0200 Subject: [PATCH 2/2] ZOOKEEPER-4391: simplify regex, omit not needed curly braces --- bin/zkEnv.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/zkEnv.sh b/bin/zkEnv.sh index 9e256441ffa..dc9dc531af2 100755 --- a/bin/zkEnv.sh +++ b/bin/zkEnv.sh @@ -136,16 +136,16 @@ export CLASSPATH # default heap for zookeeper server ZK_SERVER_HEAP="${ZK_SERVER_HEAP:-1000}" -if [[ ${ZK_SERVER_HEAP} =~ ^[0-9]+.*[0-9]+$ ]]; then +if [[ $ZK_SERVER_HEAP =~ ^[1-9][0-9]*$ ]]; then export SERVER_JVMFLAGS="-Xmx${ZK_SERVER_HEAP}m $SERVER_JVMFLAGS" else - export SERVER_JVMFLAGS="${ZK_SERVER_HEAP} $SERVER_JVMFLAGS" + export SERVER_JVMFLAGS="$ZK_SERVER_HEAP $SERVER_JVMFLAGS" fi # default heap for zookeeper client ZK_CLIENT_HEAP="${ZK_CLIENT_HEAP:-256}" -if [[ ${ZK_CLIENT_HEAP} =~ ^[0-9]+.*[0-9]+$ ]]; then +if [[ $ZK_CLIENT_HEAP =~ ^[1-9][0-9]*$ ]]; then export CLIENT_JVMFLAGS="-Xmx${ZK_CLIENT_HEAP}m $CLIENT_JVMFLAGS" else - export CLIENT_JVMFLAGS="${ZK_CLIENT_HEAP} $CLIENT_JVMFLAGS" + export CLIENT_JVMFLAGS="$ZK_CLIENT_HEAP $CLIENT_JVMFLAGS" fi