From: Sage Weil Date: Tue, 23 May 2017 18:10:54 +0000 (-0400) Subject: qa/suites/rados/*/at-end: wait for healthy before scrubbing X-Git-Tag: v12.1.0~10^2~9^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce654c51335cb0dd0db4827660475bccd6e4f286;p=ceph.git 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 --- 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 3cf78ca5a79d..f9711a126e20 100644 --- 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: