X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fosm_health.sh;h=e7c8065edb68c890cb93589bc318166dacb3ab1e;hb=b3daa3a5aa897ea1f0708c520e325bfd682d2a12;hp=0f7922a31c59aeaebbd7a355edf2101eced83e25;hpb=7e03c7d207b226f245ce6b048249d582492a065f;p=osm%2Fdevops.git diff --git a/installers/osm_health.sh b/installers/osm_health.sh index 0f7922a3..e7c8065e 100755 --- a/installers/osm_health.sh +++ b/installers/osm_health.sh @@ -54,7 +54,7 @@ while [ $time -le "$WAIT_TIME" ]; do exit 0 fi else - if [ "$(docker ps | grep " ${STACK_NAME}_" | grep -i healthy | wc -l)" -ge "$NUM_SERVICES_WITH_HEALTH" ]; then + if [ "$(sg docker -c "docker ps" | grep " ${STACK_NAME}_" | grep -i healthy | wc -l)" -ge "$NUM_SERVICES_WITH_HEALTH" ]; then # all dockers are healthy now. # final sleep is needed until more health checks are added to validate system is ready to handle requests sleep $WAIT_FINAL @@ -79,12 +79,12 @@ if [ -n "$KUBERNETES" ]; then done else echo "Not all Docker services are healthy" - docker ps | grep " ${STACK_NAME}_" + sg docker -c "docker ps" | grep " ${STACK_NAME}_" for S_WITH_HEALTH in $SERVICES_WITH_HEALTH ; do - docker ps | grep " ${STACK_NAME}_" | grep -i healthy | grep -q "_${S_WITH_HEALTH}." && continue + sg docker -c "docker ps" | grep " ${STACK_NAME}_" | grep -i healthy | grep -q "_${S_WITH_HEALTH}." && continue echo echo BEGIN LOGS of container ${S_WITH_HEALTH} not healthy - docker service logs ${STACK_NAME}_${S_WITH_HEALTH} 2>&1 | tail -n 100 + sg docker -c "docker service logs ${STACK_NAME}_${S_WITH_HEALTH} 2>&1" | tail -n 100 echo END LOGS of container ${S_WITH_HEALTH} not healthy echo done