From: David Zafman <dzafman@redhat.com>
Date: Mon, 29 Jan 2018 19:06:52 +0000 (-0800)
Subject: test: Fail upon flush_pg_stats timeout
X-Git-Tag: v12.2.4~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20548%2Fhead;p=ceph.git

test: Fail upon flush_pg_stats timeout

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index f50dd4618224..d7d4db579be5 100755
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -1398,7 +1398,7 @@ function wait_for_clean() {
     local -a delays=($(get_timeout_delays $TIMEOUT .1))
     local -i loop=0
 
-    flush_pg_stats
+    flush_pg_stats || return 1
     while test $(get_num_pgs) == 0 ; do
 	sleep 1
     done
@@ -1829,7 +1829,7 @@ function test_flush_pg_stats()
     run_osd $dir 0 || return 1
     create_rbd_pool || return 1
     rados -p rbd put obj /etc/group
-    flush_pg_stats
+    flush_pg_stats || return 1
     local jq_filter='.pools | .[] | select(.name == "rbd") | .stats'
     raw_bytes_used=`ceph df detail --format=json | jq "$jq_filter.raw_bytes_used"`
     bytes_used=`ceph df detail --format=json | jq "$jq_filter.bytes_used"`