Make sure osd_scrub_pgs gets called if healthy call fails.

Fixes: 7198
Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 4e42f4830d32ed5d5458f782d22e75524771e34e..3f297bf20afda61bf6199e8fdb30b6a0fd69bac1 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -1434,9 +1434,9 @@ def task(ctx, config):
         lambda: run_daemon(ctx=ctx, config=config, type_='osd'),
         lambda: run_daemon(ctx=ctx, config=config, type_='mds'),
         ):
-        if config.get('wait-for-healthy', True):
-            healthy(ctx=ctx, config=None)
         try:
+            if config.get('wait-for-healthy', True):
+                healthy(ctx=ctx, config=None)
             yield
         finally:
             osd_scrub_pgs(ctx, config)