From 63693779fca7a530e58ae18d348ffd97df72b9c9 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Tue, 1 Aug 2017 20:47:08 -0400 Subject: [PATCH] qa: timeout when waiting for mgr to be available Otherwise during upgrades we wait forever. Signed-off-by: Josh Durgin --- qa/tasks/ceph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 05c4c7d90abf..b8d8b8a42f57 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -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() -- 2.47.3