From 1c09d4662e8babf7cd83fbe2711344929aea8349 Mon Sep 17 00:00:00 2001 From: Adam Saponara Date: Wed, 3 Apr 2019 16:20:12 -0400 Subject: [PATCH] Respect ZK_JAVA_OPTS env in zksrv.sh Signed-off-by: Adam Saponara --- go/vt/zkctl/zksrv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/vt/zkctl/zksrv.sh b/go/vt/zkctl/zksrv.sh index 62172c5d279..aada9b9b8aa 100755 --- a/go/vt/zkctl/zksrv.sh +++ b/go/vt/zkctl/zksrv.sh @@ -20,7 +20,7 @@ logdir="$1" config="$2" pidfile="$3" - +zk_java_opts=${ZK_JAVA_OPTS:-} zk_ver=${ZK_VERSION:-3.4.14} classpath="$VTROOT/dist/vt-zookeeper-$zk_ver/lib/zookeeper-$zk_ver-fatjar.jar:/usr/local/lib/zookeeper-$zk_ver-fatjar.jar:/usr/share/java/zookeeper-$zk_ver.jar" @@ -53,7 +53,7 @@ else fi -cmd="$java -DZOO_LOG_DIR=$logdir -cp $classpath org.apache.zookeeper.server.quorum.QuorumPeerMain $config" +cmd="$java -DZOO_LOG_DIR=$logdir $zk_java_opts -cp $classpath org.apache.zookeeper.server.quorum.QuorumPeerMain $config" log "INFO starting $cmd" $cmd < /dev/null &> /dev/null &