From 41947cb0e8377c27ede190ee18d738f3991af637 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Wed, 24 May 2017 16:26:26 -0700
Subject: [PATCH] Configure to use less memory for short-lived CLI tools

---
 bin/pulsar-admin         |  4 +--
 bin/pulsar-client        |  4 +--
 conf/pulsar_tools_env.sh | 57 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100755 conf/pulsar_tools_env.sh

diff --git a/bin/pulsar-admin b/bin/pulsar-admin
index e32b2e3c5d643..0df5e5bf39724 100755
--- a/bin/pulsar-admin
+++ b/bin/pulsar-admin
@@ -21,9 +21,9 @@ PULSAR_HOME=`cd $BINDIR/..;pwd`
 DEFAULT_CLIENT_CONF=$PULSAR_HOME/conf/client.conf
 DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j.properties
 
-if [ -f "$PULSAR_HOME/conf/pulsar_env.sh" ]
+if [ -f "$PULSAR_HOME/conf/pulsar_tools_env.sh" ]
 then
-    . "$PULSAR_HOME/conf/pulsar_env.sh"
+    . "$PULSAR_HOME/conf/pulsar_tools_env.sh"
 fi
 
 # Check for the java to use
diff --git a/bin/pulsar-client b/bin/pulsar-client
index 5a3b091527813..57ef27be6434a 100755
--- a/bin/pulsar-client
+++ b/bin/pulsar-client
@@ -21,9 +21,9 @@ PULSAR_HOME=`cd $BINDIR/..;pwd`
 DEFAULT_CLIENT_CONF=$PULSAR_HOME/conf/client.conf
 DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j.properties
 
-if [ -f "$PULSAR_HOME/conf/pulsar_env.sh" ]
+if [ -f "$PULSAR_HOME/conf/pulsar_tools_env.sh" ]
 then
-    . "$PULSAR_HOME/conf/pulsar_env.sh"
+    . "$PULSAR_HOME/conf/pulsar_tools_env.sh"
 fi
 
 # Check for the java to use
diff --git a/conf/pulsar_tools_env.sh b/conf/pulsar_tools_env.sh
new file mode 100755
index 0000000000000..5d1f0ad8fbb3b
--- /dev/null
+++ b/conf/pulsar_tools_env.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+#
+# Copyright 2016 Yahoo Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# 
+
+# Set JAVA_HOME here to override the environment setting
+# JAVA_HOME=
+
+# default settings for starting pulsar broker
+
+# Log4j configuration file
+# PULSAR_LOG_CONF=
+
+# Logs location
+# PULSAR_LOG_DIR=
+
+# Configuration file of settings used in broker server
+# PULSAR_BROKER_CONF=
+
+# Configuration file of settings used in bookie server
+# PULSAR_BOOKKEEPER_CONF=
+
+# Configuration file of settings used in zookeeper server
+# PULSAR_ZK_CONF=
+
+# Configuration file of settings used in global zookeeper server
+# PULSAR_GLOBAL_ZK_CONF=
+
+# Extra options to be passed to the jvm
+PULSAR_MEM=" -Xmx256m -XX:MaxDirectMemorySize=256m"
+
+# Garbage collection options
+PULSAR_GC=" -client "
+
+# Extra options to be passed to the jvm
+PULSAR_EXTRA_OPTS="${PULSAR_MEM} ${PULSAR_GC} -Dio.netty.leakDetectionLevel=disabled"
+
+# Add extra paths to the bookkeeper classpath
+# PULSAR_EXTRA_CLASSPATH=
+
+#Folder where the Bookie server PID file should be stored
+#PULSAR_PID_DIR=
+
+#Wait time before forcefully kill the pulser server instance, if the stop is not successful
+#PULSAR_STOP_TIMEOUT=