RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-23 11:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #21444 into master

Browse Source 
* refs/pull/21444/head:
	qa: Replace 'ceph' with cluster name in restart()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Sage Weil 2018-11-25 21:20:44 -06:00
commit c9d275a0e2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qa/tasks/ceph.py
View File

@ -1475,20 +1475,21 @@ def restart(ctx, config):
daemons = ctx.daemons.resolve_role_list(config.get('daemons', None), CEPH_ROLE_TYPES, True)
clusters = set()
manager = ctx.managers['ceph']
with tweaked_option(ctx, config):
for role in daemons:
cluster, type_, id_ = teuthology.split_role(role)
ctx.daemons.get_daemon(type_, id_, cluster).restart()
clusters.add(cluster)
for dmon in daemons:
if '.' in dmon:
dm_parts = dmon.split('.')
if dm_parts[1].isdigit():
if dm_parts[0] == 'osd':
manager.mark_down_osd(int(dm_parts[1]))
for cluster in clusters:
manager = ctx.managers[cluster]
for dmon in daemons:
if '.' in dmon:
dm_parts = dmon.split('.')
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: