[pulsar] branch master updated: Pulsar Startup Script fixes to provide custom conf files for bookie shell and configuration store. (#3627)

[jai1]

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

jai1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 4de22cd  Pulsar Startup Script fixes to provide custom conf files for 
bookie shell and configuration store. (#3627)
4de22cd is described below

commit 4de22cdb83a667a3029114cf763108f7a3238331
Author: Jai Asher <j...@ccs.neu.edu>
AuthorDate: Wed Feb 20 09:48:50 2019 -0800

    Pulsar Startup Script fixes to provide custom conf files for bookie shell 
and configuration store. (#3627)
---
 bin/pulsar    | 1 -
 conf/bkenv.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/pulsar b/bin/pulsar
index 9f4224b..5544ff0 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -221,7 +221,6 @@ fi
 
 if [ -z "$PULSAR_GLOBAL_ZK_CONF" ]; then
     PULSAR_GLOBAL_ZK_CONF=$DEFAULT_GLOBAL_ZK_CONF
-    PULSAR_CONFIGURATION_STORE_CONF=$DEFAULT_GLOBAL_ZK_CONF
 fi
 
 if [ -z "$PULSAR_CONFIGURATION_STORE_CONF" ]; then
diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 6fc6c42..aab706d 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -24,7 +24,7 @@
 # default settings for starting bookkeeper
 
 # Configuration file of settings used in bookie server
-BOOKIE_CONF=$BK_HOME/conf/bookkeeper.conf
+BOOKIE_CONF=${BOOKIE_CONF:-"$BK_HOME/conf/bookkeeper.conf"}
 
 # Log4j configuration file
 # BOOKIE_LOG_CONF=