RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/ceph.py: fix timing of wait-for-* and osd markdown

Browse Source 
Mark down osds, *then* wait for them to come up or for the cluster to be
healthy!

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-02-17 17:17:18 -05:00
parent ccc885ac59
commit 86c0d07e32
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qa/tasks/ceph.py
View File

@ -1301,12 +1301,6 @@ def restart(ctx, config):
ctx.daemons.get_daemon(type_, id_, cluster).restart()
clusters.add(cluster)
if config.get('wait-for-healthy', True):
for cluster in clusters:
healthy(ctx=ctx, config=dict(cluster=cluster))
if config.get('wait-for-osds-up', False):
for cluster in clusters:
wait_for_osds_up(ctx=ctx, config=dict(cluster=cluster))
manager = ctx.managers['ceph']
for dmon in daemons:
if '.' in dmon:
@ -1314,6 +1308,13 @@ def restart(ctx, config):
if dm_parts[1].isdigit():
if dm_parts[0] == 'osd':
manager.mark_down_osd(int(dm_parts[1]))
if config.get('wait-for-healthy', True):
for cluster in clusters:
healthy(ctx=ctx, config=dict(cluster=cluster))
if config.get('wait-for-osds-up', False):
for cluster in clusters:
wait_for_osds_up(ctx=ctx, config=dict(cluster=cluster))
yield