[bookkeeper] branch branch-4.7 updated: Add config BK_metadataServiceUri for docker

[si...@apache.org]

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

sijie pushed a commit to branch branch-4.7
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.7 by this push:
     new ab416d7  Add config BK_metadataServiceUri for docker
ab416d7 is described below

commit ab416d704039f083287d3bc82e1eff56dc47ec78
Author: Jia Zhai <zh...@apache.org>
AuthorDate: Mon Apr 23 17:52:05 2018 -0700

    Add config BK_metadataServiceUri for docker
    
    Descriptions of the changes in this PR:
    
    While trying docker in 4.7.0 release, found that the new config parameter `metadataServiceUri` was changing leaked, and docker could not run success.
    This change add the config `BK_metadataServiceUri` for docker config, and make docker 4.7.0 runs success.
    
    Author: Jia Zhai <zh...@apache.org>
    
    Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
    
    This closes #1362 from jiazhai/docker_conf
    
    (cherry picked from commit f78ea8238b44c8ae52ea6cf9445228afdeffc7aa)
    Signed-off-by: Sijie Guo <si...@apache.org>
---
 docker/scripts/entrypoint.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 3ffb1ec..91e63c3 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -27,7 +27,7 @@ export JAVA_HOME=/usr
 PORT0=${PORT0:-${BOOKIE_PORT}}
 PORT0=${PORT0:-3181}
 BK_DATA_DIR=${BK_DATA_DIR:-"/data/bookkeeper"}
-BK_CLUSTER_ROOT_PATH=${BK_CLUSTER_ROOT_PATH:-" "}
+BK_CLUSTER_ROOT_PATH=${BK_CLUSTER_ROOT_PATH:-""}
 
 # env vars to replace values in config files
 export BK_bookiePort=${BK_bookiePort:-${PORT0}}
@@ -36,12 +36,13 @@ export BK_zkLedgersRootPath=${BK_zkLedgersRootPath:-"${BK_CLUSTER_ROOT_PATH}/led
 export BK_journalDirectory=${BK_journalDirectory:-${BK_DATA_DIR}/journal}
 export BK_ledgerDirectories=${BK_ledgerDirectories:-${BK_DATA_DIR}/ledgers}
 export BK_indexDirectories=${BK_indexDirectories:-${BK_DATA_DIR}/index}
+export BK_metadataServiceUri=${BK_metadataServiceUri:-"zk://${BK_zkServers}${BK_zkLedgersRootPath}"}
 
 echo "BK_bookiePort bookie service port is $BK_bookiePort"
 echo "BK_zkServers is $BK_zkServers"
 echo "BK_DATA_DIR is $BK_DATA_DIR"
 echo "BK_CLUSTER_ROOT_PATH is $BK_CLUSTER_ROOT_PATH"
-
+echo "BK_metadataServiceUri is $BK_metadataServiceUri"
 
 mkdir -p "${BK_journalDirectory}" "${BK_ledgerDirectories}" "${BK_indexDirectories}"
 # -------------- #

-- 
To stop receiving notification emails like this one, please contact
sijie@apache.org.