This is an automated email from the ASF dual-hosted git repository.
nwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new a130d5e adding wait for zookeeper script (#3313)
a130d5e is described below
commit a130d5e54cd8642d7e26584ed2e2f9d2285570be
Author: Josh Fischer <[email protected]>
AuthorDate: Fri Aug 2 01:04:48 2019 -0500
adding wait for zookeeper script (#3313)
---
docker/dist/Dockerfile.dist.debian9 | 3 ++-
docker/dist/Dockerfile.dist.ubuntu14.04 | 3 ++-
docker/dist/scripts/wait-for-zookeeper.sh | 36 +++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/docker/dist/Dockerfile.dist.debian9
b/docker/dist/Dockerfile.dist.debian9
index f183129..94fdaa2 100644
--- a/docker/dist/Dockerfile.dist.debian9
+++ b/docker/dist/Dockerfile.dist.debian9
@@ -82,4 +82,5 @@ RUN mkdir -p /opt/zookeeper/scripts
ADD dist/scripts /opt/zookeeper/scripts
RUN chmod +x /opt/zookeeper/scripts/generate-zookeeper-config.sh \
&& chmod +x /opt/zookeeper/scripts/zookeeper-ruok.sh \
- && chmod +x /opt/zookeeper/scripts/start-zookeeper.sh
+ && chmod +x /opt/zookeeper/scripts/start-zookeeper.sh \
+ && chmod +x /opt/zookeeper/scripts/wait-for-zookeeper.sh
diff --git a/docker/dist/Dockerfile.dist.ubuntu14.04
b/docker/dist/Dockerfile.dist.ubuntu14.04
index 04f2602..17930e0 100644
--- a/docker/dist/Dockerfile.dist.ubuntu14.04
+++ b/docker/dist/Dockerfile.dist.ubuntu14.04
@@ -82,6 +82,7 @@ RUN mkdir -p /opt/zookeeper/scripts
ADD dist/scripts /opt/zookeeper/scripts
RUN chmod +x /opt/zookeeper/scripts/generate-zookeeper-config.sh \
&& chmod +x /opt/zookeeper/scripts/zookeeper-ruok.sh \
- && chmod +x /opt/zookeeper/scripts/start-zookeeper.sh
+ && chmod +x /opt/zookeeper/scripts/start-zookeeper.sh \
+ && chmod +x /opt/zookeeper/scripts/wait-for-zookeeper.sh
CMD ["supervisord", "-n"]
diff --git a/docker/dist/scripts/wait-for-zookeeper.sh
b/docker/dist/scripts/wait-for-zookeeper.sh
new file mode 100644
index 0000000..bd6b353
--- /dev/null
+++ b/docker/dist/scripts/wait-for-zookeeper.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+if [ "$#" -ne 2 ]; then
+ echo "Usage: $0 <zookeeper-host> <zookeeper-port>"
+ exit 1
+fi
+
+WAIT_ZK_HOST=$1
+WAIT_ZK_PORT=$2
+
+while true; do
+ status=$(echo ruok | nc $WAIT_ZK_HOST $WAIT_ZK_PORT);
+ writestatus=$(echo isro | nc $WAIT_ZK_HOST $WAIT_ZK_PORT)
+ if [ "$status" = "imok" ] && [ "$writestatus" == "rw" ]; then
+ echo "Zookeeper $WAIT_ZK_HOST:$WAIT_ZK_PORT is ready";
+ exit 0
+ fi;
+ echo "Zookeeper $WAIT_ZK_HOST:$WAIT_ZK_PORT not ready";
+ sleep 4;
+done
