From ceffee40d453aef1ec3c3f60520282e967bb78e0 Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Mon, 10 Feb 2014 09:28:39 -0800 Subject: [PATCH] Make sure osd_scrub_pgs gets called if healthy call fails. Fixes: 7198 Signed-off-by: Warren Usui --- teuthology/task/ceph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py index 4e42f4830..3f297bf20 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) -- 2.47.3