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

Merge pull request #16797 from jdurgin/wip-upgrade-jewel-x

Browse Source 
qa: timeout when waiting for mgr to be available in healthy()

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Josh Durgin 2017-08-03 11:11:41 -07:00 committed by GitHub
commit ae48c75065
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qa/tasks/ceph.py
View File

@ -1225,9 +1225,9 @@ def healthy(ctx, config):
log.info('Waiting until %s daemons up and pgs clean...', cluster_name)
manager = ctx.managers[cluster_name]
try:
manager.wait_for_mgr_available()
except run.CommandFailedError:
log.info('ignoring mgr wait error, probably testing upgrade')
manager.wait_for_mgr_available(timeout=30)
except (run.CommandFailedError, AssertionError) as e:
log.info('ignoring mgr wait error, probably testing upgrade: %s', e)
firstmon = teuthology.get_first_mon(ctx, config, cluster_name)
(mon0_remote,) = ctx.cluster.only(firstmon).remotes.keys()