test/ceph-helpers: add timeout to ceph pg query

Fixes: https://tracker.ceph.com/issues/75406
Signed-off-by: Nitzan Mordechai <nmordec@ibm.com>

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index aa020891d090af8dcd37e0f52c5d8b8fef234cce..93185d6844f6ac4a666a36a326c67fe811367953 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -1570,8 +1570,9 @@ function test_is_clean() {
 #
 function is_pg_clean() {
     local pgid=$1
+    local timeout=${2:-$WAIT_FOR_CLEAN_TIMEOUT}
     local pg_state
-    pg_state=$(ceph pg $pgid query 2>/dev/null | jq -r ".state ")
+    pg_state=$(timeout $timeout ceph pg $pgid query 2>/dev/null | jq -r ".state ")
     [[ "$pg_state" == "active+clean"* ]]
 }
 
@@ -1707,7 +1708,7 @@ function wait_for_pg_clean() {
 
     while true ; do
         echo "#---------- $pgid loop $loop"
-        is_pg_clean $pg_id && break
+        is_pg_clean $pg_id $WAIT_FOR_CLEAN_TIMEOUT && break
         if (( $loop >= ${#delays[*]} )) ; then
             ceph report
             echo "PG $pg_id is not clean after $loop iterations"