Set a maximum number of Elasticsearch checks

Author: oalders

Diff for: .circleci/config.yml

@@ -47,7 +47,7 @@ jobs:
       - run:
           command: |
             pushd metacpan-docker/src/metacpan-api
-            ./wait-for-es.sh elasticsearch_test http://localhost:9200
+            ./wait-for-es.sh http://localhost:9200 elasticsearch_test --
           name: wait for ES
       - run:
           command: |

Diff for: wait-for-es.sh

@@ -5,13 +5,18 @@
 
 set -ux
 
-container="$1"
-host="$2"
 
-preamble="docker-compose exec $container"
+HOST="$1"
+CONTAINER=${2:-""}
+PREAMBLE=""
+
+echo "container |$CONTAINER|"
+if [[ $CONTAINER != "" ]]; then
+    PREAMBLE="docker-compose exec $CONTAINER"
+fi
 
 while true; do
-    response=$($preamble curl --write-out '%{http_code}' --silent --fail --output /dev/null "$host")
+    response=$($PREAMBLE curl --write-out '%{http_code}' --silent --fail --output /dev/null "$HOST")
     if [[ "$response" -eq "200" ]]; then
         break
     fi
@@ -24,16 +29,27 @@ done
 # if the server was not available
 set -e
 
+COUNTER=0
+MAX_LOOPS=60
 while true; do
     ## Wait for ES status to turn to yellow.
     ## TODO: Ideally we'd be waiting for green, but we need multiple nodes for that.
-    health=$($preamble curl -fsSL "$host/_cat/health?format=JSON" | jq '.[0].status == "yellow" or .[0].status == "green"')
+    health=$($PREAMBLE curl -fsSL "$HOST/_cat/health?format=JSON" | jq '.[0].status == "yellow" or .[0].status == "green"')
     if [[ $health == 'true' ]]; then
+        echo "Elasticsearch is up" >&2
         break
     fi
     echo "Elastic Search is unavailable ($health) - sleeping" >&2
+    COUNTER=$((COUNTER + 1))
+    if [[ $COUNTER -gt $MAX_LOOPS ]]; then
+        echo "Giving up after $COUNTER attempts"
+        exit 1
+        break
+    fi
     sleep 1
 done
 
-echo "Elastic Search is up" >&2
-exit 0
+# Allow commands to be chained
+shift
+shift
+exec "$@"