From: Warren Usui <warren.usui@inktank.com>
Date: Mon, 10 Feb 2014 17:28:39 +0000 (-0800)
Subject: Make sure osd_scrub_pgs gets called if healthy call fails.
X-Git-Tag: v0.94.10~27^2^2~364^2~384^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ceffee40d453aef1ec3c3f60520282e967bb78e0;p=ceph.git

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 4e42f4830d3..3f297bf20af 100644
--- 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)