]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Fail upon flush_pg_stats timeout
authorDavid Zafman <dzafman@redhat.com>
Mon, 29 Jan 2018 19:06:52 +0000 (11:06 -0800)
committerDavid Zafman <dzafman@redhat.com>
Sun, 11 Mar 2018 23:26:11 +0000 (16:26 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
qa/standalone/ceph-helpers.sh

index 7268374bba88293e3eb6b22d10dee105639de6c8..9257e632752c295d54a8731aa17057a8ea1a5389 100755 (executable)
@@ -1397,7 +1397,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
@@ -1834,7 +1834,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"`