RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 03:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move osd_scrub_pgs call to finally block of ceph main task.

Browse Source 
Fixes: 7198
Signed-off-bye: Warren Usui <warren.usui@inktank.com>
This commit is contained in:
Warren Usui 2014-02-07 14:54:23 -08:00
parent 2bcc60061c
commit 69f29d17f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
teuthology/task/ceph.py
View File

@ -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)