From 20b8e4703d352fe530b2ebad244bcec3915b3549 Mon Sep 17 00:00:00 2001
From: sunil unnava <sunil.unnava@att.com>
Date: Thu, 29 Nov 2018 14:47:08 -0500
Subject: changes to Zookeeper startup script

Issue-ID: DMAAP-888
Change-Id: I81c3e9ce7de395ea92f1dc5ea69d9f603f862d75
Signed-off-by: sunil unnava <sunil.unnava@att.com>
---
 src/main/docker/Dockerfile                 |  6 +-----
 src/main/docker/scripts/start-zookeeper.sh | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 5584025..95fb3a9 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -50,8 +50,4 @@ RUN set -x \
     && ln -s /opt/zookeeper/$ZK_DIST.jar /usr/share/zookeeper/ \
 && ln -s /opt/zookeeper/lib/* /usr/share/zookeeper
 
-
-
-RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/start-zookeeper.sh
-RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/zookeeper-metrics.sh
-RUN chown -R $ZK_USER:$ZK_USER /opt/zookeeper/bin/zookeeper-ready.sh
+chmod -R 777 /opt/zookeeper/bin
\ No newline at end of file
diff --git a/src/main/docker/scripts/start-zookeeper.sh b/src/main/docker/scripts/start-zookeeper.sh
index 9ae7a76..e80484f 100644
--- a/src/main/docker/scripts/start-zookeeper.sh
+++ b/src/main/docker/scripts/start-zookeeper.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
+ZK_REPLICAS=${ZK_REPLICAS:-1}
 ZK_USER=${ZK_USER:-"root"}
 ZK_LOG_LEVEL=${ZK_LOG_LEVEL:-"INFO"}
 ZK_DATA_DIR=${ZK_DATA_DIR:-"/var/lib/zookeeper/data"}
-ZK_DATA_LOG_DIR=${ZK_DATA_LOG_DIR:-"/var/lib/zookeeper/log"}
+ZK_DATA_LOG_DIR=${ZK_DATA_LOG_DIR:-"/var/lib/zookeeper/data"}
 ZK_LOG_DIR=${ZK_LOG_DIR:-"var/log/zookeeper"}
 ZK_CONF_DIR=${ZK_CONF_DIR:-"/opt/zookeeper/conf"}
 ZK_CLIENT_PORT=${ZK_CLIENT_PORT:-2181}
@@ -36,22 +37,18 @@ function print_servers() {
 function validate_env() {
     echo "Validating environment"
 
-    if [ -z $ZK_REPLICAS ]; then
-        echo "ZK_REPLICAS is a mandatory environment variable"
-        exit 1
-    fi
-
-    if [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
+    if [  $ZK_REPLICAS -gt 1] &&  [[ $HOST =~ (.*)-([0-9]+)$ ]]; then
+    
         NAME=${BASH_REMATCH[1]}
         ORD=${BASH_REMATCH[2]}
+        MY_ID=$((ORD+1))
+        echo "MY_ID=$MY_ID"
     else
         echo "Failed to extract ordinal from hostname $HOST"
-        exit 1
     fi
-
-    MY_ID=$((ORD+1))
+    
+   
     echo "ZK_REPLICAS=$ZK_REPLICAS"
-    echo "MY_ID=$MY_ID"
     echo "ZK_LOG_LEVEL=$ZK_LOG_LEVEL"
     echo "ZK_DATA_DIR=$ZK_DATA_DIR"
     echo "ZK_DATA_LOG_DIR=$ZK_DATA_LOG_DIR"
@@ -69,8 +66,12 @@ function validate_env() {
     echo "ZK_SNAP_RETAIN_COUNT=$ZK_SNAP_RETAIN_COUNT"
     echo "ZK_PURGE_INTERVAL=$ZK_PURGE_INTERVAL"
     echo "ZK_PRE_ALLOC_SIZE=$ZK_PRE_ALLOC_SIZE"
-    echo "ENSEMBLE"
-    print_servers
+    
+    if [ $ZK_REPLICAS -gt 1 ]  then
+        echo "ENSEMBLE"
+        print_servers
+        fi
+    
     echo "Environment validation successful"
 }
 
@@ -116,9 +117,8 @@ function create_data_dirs() {
         chown -R $ZK_USER:$ZK_USER $ZK_LOG_DIR
     fi
 
-    if [ $ZK_REPLICAS -gt 1 ]; then
+    if [ $ZK_REPLICAS -gt 1 ] && [  ! -f $ID_FILE]; then
         echo $MY_ID >> $ID_FILE
-        cat  $ID_FILE
         fi
 
     echo "Created ZooKeeper data directories and set permissions in $ZK_DATA_DIR"
-- 
cgit 1.2.3-korg