From: Warren Usui <warren.usui@inktank.com>
Date: Fri, 7 Feb 2014 22:54:23 +0000 (-0800)
Subject: Move osd_scrub_pgs call to finally block of ceph main task.
X-Git-Tag: 1.1.0~1674^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=69f29d17f0720b80a2d2b0119ae57e4ac955d51a;p=teuthology.git

Move osd_scrub_pgs call to finally block of ceph main task.

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

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 92db5269bc..4e42f4830d 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -1181,8 +1181,6 @@ def run_daemon(ctx, config, type_):
     try:
         yield
     finally:
-        if type_ == 'osd':
-            osd_scrub_pgs(ctx, config)
         teuthology.stop_daemons_of_type(ctx, type_)
 
 def healthy(ctx, config):
@@ -1437,5 +1435,8 @@ def task(ctx, config):
         lambda: run_daemon(ctx=ctx, config=config, type_='mds'),
         ):
         if config.get('wait-for-healthy', True):
-          healthy(ctx=ctx, config=None)
-        yield
+            healthy(ctx=ctx, config=None)
+        try:
+            yield
+        finally:
+            osd_scrub_pgs(ctx, config)