qa/suites/rados/*/at-end: wait for healthy before scrubbing

The scrub_pgs command also waits for healthy for a while, but fails
silently if it times out, which means the subsequent scrubs will also
fail to clean up.

This forces an earlier failure that does not obscure the root cause.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/thrash/d-require-luminous/at-end.yaml b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
index 3cf78ca5a79d9ccbf70c15c1dcb0a8080593d676..f9711a126e20244d125886e577355c73e26cecf4 100644 (file)
--- a/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
+++ b/qa/suites/rados/thrash/d-require-luminous/at-end.yaml
@@ -8,6 +8,7 @@ tasks:
         - ceph osd set require_luminous_osds
 # make sure osds have latest map
         - rados -p rbd bench 5 write -b 4096
+  - ceph.healthy:
   - ceph.osd_scrub_pgs:
       cluster: ceph
   - exec: