From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 2 Aug 2017 00:47:08 +0000 (-0400)
Subject: qa: timeout when waiting for mgr to be available
X-Git-Tag: ses5-milestone10~3^2~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16797%2Fhead;p=ceph.git

qa: timeout when waiting for mgr to be available

Otherwise during upgrades we wait forever.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 05c4c7d90abf3..b8d8b8a42f57b 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()