[OPS-1049] wait scripts should exit with 1 if service is not up after retries

Author: georgeyord

filesystem/usr/local/share/landoop/wait-scripts/wait-for-connect.sh

@@ -12,6 +12,7 @@ for ((i=0;i<$W_ITERATIONS;i++)); do
     # random wait. It isn't a great solution, but it may help.
     curl -sS "${W_CONNECT_ADDRESS}/connector-plugins/" \
         | grep "org.apache.kafka.connect.file.FileStreamSourceConnector" \
-        && { sleep $(( RANDOM%(5*W_PERIOD_SECS) )); break; }
+        && { sleep $(( RANDOM%(5*W_PERIOD_SECS) )); exit 0; }
 done
 
+exit 1

filesystem/usr/local/share/landoop/wait-scripts/wait-for-kafka.sh

@@ -2,6 +2,7 @@
 
 W_ITERATIONS=${W_ITERATIONS:-60}
 W_PERIOD_SECS=${W_PERIOD_SECS:-2}
+W_ALLOW_FAIL=${W_ALLOW_FAIL:-0}
 W_BROKERS_WANTED=${W_BROKERS_WANTED:-1}
 W_ZK_ADDRESS=${W_ZK_ADDRESS:-127.0.0.1}
 W_ZK_PORT=${W_ZK_PORT:-$ZK_PORT}
@@ -13,7 +14,8 @@ for ((i=0;i<$W_ITERATIONS;i++)); do
     echo "Brokers detected/wanted: $_BROKER_NUM / $W_BROKERS_WANTED"
     if [[ ${_BROKER_NUM} -ge ${W_BROKERS_WANTED} ]]; then
         sleep 1
-        break
+        exit 0
     fi
 done
 
+exit 1

filesystem/usr/local/share/landoop/wait-scripts/wait-for-registry.sh

@@ -6,6 +6,7 @@ W_SR_ADDRESS=${W_SR_ADDRESS:-http://127.0.0.1:$REGISTRY_PORT}
 
 for ((i=0;i<$W_ITERATIONS;i++)); do
     sleep $W_PERIOD_SECS
-    curl -sS "$W_SR_ADDRESS" | grep "{}" && break
+    curl -sS "$W_SR_ADDRESS" | grep "{}" && exit 0
 done
 
+exit 1

filesystem/usr/local/share/landoop/wait-scripts/wait-for-zookeeper.sh

@@ -8,6 +8,7 @@ W_ZK_PORT=${W_ZK_PORT:-2181}
 
 for ((i=0;i<$W_ITERATIONS;i++)); do
     sleep $W_PERIOD_SECS
-    echo ruok | nc $W_ZK_ADDRESS $W_ZK_PORT | grep imok && break
+    echo ruok | nc $W_ZK_ADDRESS $W_ZK_PORT | grep imok && exit 0
 done
 
+exit 1