From ecbb904da4f879b3012c9c0f76efaf9899af668f Mon Sep 17 00:00:00 2001
From: wangjialing <wangjialing_yewu@cmss.chinamobile.com>
Date: Fri, 15 Jul 2022 17:19:10 +0800
Subject: [PATCH 1/2] rename pulsar env variables for pulsar tools

---
 conf/pulsar_tools_env.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/pulsar_tools_env.sh b/conf/pulsar_tools_env.sh
index a356dbb9a28df..8f155554d9f7c 100755
--- a/conf/pulsar_tools_env.sh
+++ b/conf/pulsar_tools_env.sh
@@ -42,13 +42,13 @@
 # PULSAR_GLOBAL_ZK_CONF=
 
 # Extra options to be passed to the jvm
-PULSAR_MEM=${PULSAR_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
+PULSAR_TOOL_MEM=${PULSAR_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
 
 # Garbage collection options
-PULSAR_GC=${PULSAR_GC:-" -client "}
+PULSAR_TOOL_GC=${PULSAR_GC:-" -client "}
 
 # Extra options to be passed to the jvm
-PULSAR_EXTRA_OPTS="${PULSAR_MEM} ${PULSAR_GC} ${PULSAR_GC_LOG} -Dio.netty.leakDetectionLevel=disabled ${PULSAR_EXTRA_OPTS}"
+PULSAR_EXTRA_OPTS="${PULSAR_TOOL_MEM} ${PULSAR_TOOL_GC} ${PULSAR_GC_LOG} -Dio.netty.leakDetectionLevel=disabled ${PULSAR_EXTRA_OPTS}"
 
 # Add extra paths to the bookkeeper classpath
 # PULSAR_EXTRA_CLASSPATH=

From 2fd2d11109774a0c15c65b9de63e2b798260abb8 Mon Sep 17 00:00:00 2001
From: wangjialing <wangjialing_yewu@cmss.chinamobile.com>
Date: Mon, 18 Jul 2022 09:35:41 +0800
Subject: [PATCH 2/2] rename pulsar env variables for pulsar tools

---
 conf/pulsar_tools_env.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/pulsar_tools_env.sh b/conf/pulsar_tools_env.sh
index 8f155554d9f7c..1be4f76f99901 100755
--- a/conf/pulsar_tools_env.sh
+++ b/conf/pulsar_tools_env.sh
@@ -42,10 +42,10 @@
 # PULSAR_GLOBAL_ZK_CONF=
 
 # Extra options to be passed to the jvm
-PULSAR_TOOL_MEM=${PULSAR_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
+PULSAR_TOOL_MEM=${PULSAR_TOOL_MEM:-"-Xmx128m -XX:MaxDirectMemorySize=128m"}
 
 # Garbage collection options
-PULSAR_TOOL_GC=${PULSAR_GC:-" -client "}
+PULSAR_TOOL_GC=${PULSAR_TOOL_GC:-" -client "}
 
 # Extra options to be passed to the jvm
 PULSAR_EXTRA_OPTS="${PULSAR_TOOL_MEM} ${PULSAR_TOOL_GC} ${PULSAR_GC_LOG} -Dio.netty.leakDetectionLevel=disabled ${PULSAR_EXTRA_OPTS}"