qa/cephadm: add timeouts and debug commands to rgw-ingress test

This won't make the test pass in and of itself, but it should
stop the test from running until it hits the max job timeout
and should help see where it's failing

Signed-off-by: Adam King <adking@redhat.com>

diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml
index 710edab73757fa44a16fd9136c66ae8bf3b31299..13a344a6cd2be5dfab4ce8ff50b09d587e8d402d 100644 (file)
--- a/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml
+++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/rgw-ingress.yaml
@@ -41,20 +41,20 @@ tasks:
         echo "Check with each rgw stopped in turn..."
         for rgw in `ceph orch ps | grep ^rgw.foo. | awk '{print $1}'`; do
           ceph orch daemon stop $rgw
-          while ! ceph orch ps | grep $rgw | grep stopped; do sleep 1 ; done
-          while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done
+          timeout 300 bash -c "while ! ceph orch ps | grep $rgw | grep stopped; do echo 'Waiting for $rgw to stop'; ceph orch ps --daemon-type rgw; ceph health detail; sleep 5 ; done"
+          timeout 300 bash -c "while ! curl http://{{VIP0}}:9000/ ; do echo 'Waiting for http://{{VIP0}}:9000/ to be available'; sleep 1 ; done"
           ceph orch daemon start $rgw
-          while ! ceph orch ps | grep $rgw | grep running; do sleep 1 ; done
+          timeout 300 bash -c "while ! ceph orch ps | grep $rgw | grep running; do echo 'Waiting for $rgw to start'; ceph orch ps --daemon-type rgw; ceph health detail; sleep 5 ; done"
         done
 
         # stop each haproxy in turn
         echo "Check with each haproxy down in turn..."
         for haproxy in `ceph orch ps | grep ^haproxy.rgw.foo. | awk '{print $1}'`; do
           ceph orch daemon stop $haproxy
-          while ! ceph orch ps | grep $haproxy | grep stopped; do sleep 1 ; done
-          while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done
+          timeout 300 bash -c "while ! ceph orch ps | grep $haproxy | grep stopped; do echo 'Waiting for $haproxy to stop'; ceph orch ps --daemon-type haproxy; ceph health detail; sleep 5 ; done"
+          timeout 300 bash -c "while ! curl http://{{VIP0}}:9000/ ; do echo 'Waiting for http://{{VIP0}}:9000/ to be available'; sleep 1 ; done"
           ceph orch daemon start $haproxy
-          while ! ceph orch ps | grep $haproxy | grep running; do sleep 1 ; done
+          timeout 300 bash -c "while ! ceph orch ps | grep $haproxy | grep running; do echo 'Waiting for $haproxy to start'; ceph orch ps --daemon-type haproxy; ceph health detail; sleep 5 ; done"
         done
 
-        while ! curl http://{{VIP0}}:9000/ ; do sleep 1 ; done
+        timeout 300 bash -c "while ! curl http://{{VIP0}}:9000/ ; do echo 'Waiting for http://{{VIP0}}:9000/ to be available'; sleep 1 ; done"