Merge pull request #993 from metacpan/oalders/wait-for-es

wait-for-es.sh should work inside and outside of Docker containers

Author: oalders

.circleci/config.yml

@@ -1,10 +1,8 @@
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
-# Use a package of configuration called an orb.
 # Orchestrate or schedule a set of jobs
 workflows:
   docker-compose:
-    # Run the welcome/run job in its own container
     jobs:
       - build-and-test
 jobs:
@@ -16,8 +14,10 @@ jobs:
           name: Install Docker Compose
           command: |
             set -x
-            curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
-            sudo chmod +x ~/docker-compose
+            curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > /home/circleci/bin/docker-compose
+            sudo chmod +x /home/circleci/bin/docker-compose
+            which docker-compose
+            docker-compose --version
       - run:
           command: |
             git clone https://github.com/metacpan/metacpan-docker.git
@@ -36,27 +36,27 @@ jobs:
       - run:
           command: |
             pushd metacpan-docker
-            ~/docker-compose build --build-arg CPM_ARGS='--with-test' api_test
+            docker-compose build --build-arg CPM_ARGS='--with-test' api_test
           name: compose build
       - run:
           command: |
             pushd metacpan-docker
             ./bin/metacpan-docker init
-            ~/docker-compose --verbose up -d api_test
+            docker-compose --verbose up -d api_test
           name: compose up
       - run:
           command: |
-            pushd metacpan-docker/src/metacpan-api
-            ./wait-for-es.sh http://localhost:9200
+            pushd metacpan-docker
+            ./src/metacpan-api/wait-for-es.sh http://localhost:9200 elasticsearch_test --
           name: wait for ES
       - run:
           command: |
             pushd metacpan-docker
-            ~/docker-compose exec -T api_test prove -lr --jobs 2 t
+            docker-compose exec -T api_test prove -lr --jobs 2 t
       - run:
           command: |
             pushd metacpan-docker
-            ~/docker-compose logs
+            docker-compose logs
             docker stats --no-stream
             docker ps -a | head
           name: docker-compose logs

Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /metacpan-api
 # size of the images.
 RUN mkdir /CPAN \
     && apt-get update \
-    && apt-get install -y --no-install-recommends rsync=3.1.3-6 \
+    && apt-get install -y --no-install-recommends rsync=3.1.3-6 jq \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && cpm install --global \

wait-for-es.sh

@@ -5,10 +5,18 @@
 
 set -ux
 
-host="$1"
+
+HOST="$1"
+CONTAINER=${2:-""}
+PREAMBLE=""
+
+echo "container |$CONTAINER|"
+if [[ $CONTAINER != "" ]]; then
+    PREAMBLE="docker-compose exec $CONTAINER"
+fi
 
 while true; do
-    response=$(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
@@ -21,18 +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="$(curl -fsSL "$host/_cat/health?h=status")"
-    health="$(echo "$health" | xargs)" # trim whitespace (otherwise we'll have "green ")
-    if [[ $health == 'yellow' || $health == 'green' ]]; then
+    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
+# Allow commands to be chained
+shift
 shift
 exec "$@"