Make start-cassandra health check platform-independent

Author: pauloricardomg

.build/docker/Dockerfile

@@ -43,6 +43,8 @@ RUN set -eux; \
 #   https://github.com/apache/cassandra/blob/18bcda2d4c2eba7370a0b21f33eed37cb730bbb3/bin/cassandra#L90-L100
 #   https://github.com/apache/cassandra/commit/604c0e87dc67fa65f6904ef9a98a029c9f2f865a
 		numactl \
+# required for docker health-check
+		netcat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # https://issues.apache.org/jira/browse/CASSANDRA-15767 ("bin/cassandra" only looks for "libjemalloc.so" or "libjemalloc.so.1" which doesn't match our "libjemalloc.so.2")
@@ -127,4 +129,8 @@ ENTRYPOINT ["docker-entrypoint.sh"]
 # 9042: CQL
 # 9160: thrift service
 EXPOSE 7000 7001 7199 9042 9160
+
+# Check the daemon is listening on CQL/JMX ports
+HEALTHCHECK CMD /usr/bin/nc localhost -z 9042 && /usr/bin/nc localhost -z 7199 || exit 1
+
 CMD ["cassandra", "-f"]

.build/docker/start.sh

@@ -48,13 +48,17 @@ fi
 docker network create cassandra-test 2>/dev/null || true
 
 CONTAINER_ID=`docker run --rm --name cassandra-test --network cassandra-test -d apache/cassandra-test`
-CONTAINER_IP=`docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CONTAINER_ID`
 
-until nc -z $CONTAINER_IP 9042
+until [ "$( docker container inspect -f '{{.State.Health.Status}}' $CONTAINER_ID )" != "starting" ]
 do
-  echo "Waiting for cassandra-test container $CONTAINER_ID to start listening on $CONTAINER_IP:9042..."
+  echo "Waiting for cassandra-test container $CONTAINER_ID to start."
   sleep 5
 done
 
-echo "cassandra-test container started with id $CONTAINER_ID and ip $CONTAINER_IP"
+if [ "$( docker container inspect -f '{{.State.Health.Status}}' $CONTAINER_ID )" != "healthy" ]; then
+  echo "Cassandra test container $CONTAINER_ID started but is unhealty."
+  exit 1
+fi
+
+echo "cassandra-test container started with id $CONTAINER_ID"
 display_help