qa/tasks/ceph2: use safe_while

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py
index 20c949ac1b3a1586b729d85603bf9f4f992bbed7..3290d90e0484878460f0fcd0add8d5182e0678e9 100644 (file)
--- a/qa/tasks/ceph2.py
+++ b/qa/tasks/ceph2.py
@@ -405,21 +405,21 @@ def ceph_mons(ctx, config):
                     started=True,
                 )
 
-                while True:
-                    log.info('Waiting for %d mons in monmap...' % (num_mons))
-                    r = shell(
-                        ctx=ctx,
-                        cluster_name=cluster_name,
-                        remote=remote,
-                        args=[
-                            'ceph', 'mon', 'dump', '-f', 'json',
-                        ],
-                        stdout=StringIO(),
-                    )
-                    j = json.loads(r.stdout.getvalue())
-                    if len(j['mons']) == num_mons:
-                        break
-                    time.sleep(1)
+                with contextutil.safe_while(sleep=1, tries=180) as proceed:
+                    while proceed():
+                        log.info('Waiting for %d mons in monmap...' % (num_mons))
+                        r = shell(
+                            ctx=ctx,
+                            cluster_name=cluster_name,
+                            remote=remote,
+                            args=[
+                                'ceph', 'mon', 'dump', '-f', 'json',
+                            ],
+                            stdout=StringIO(),
+                        )
+                        j = json.loads(r.stdout.getvalue())
+                        if len(j['mons']) == num_mons:
+                            break
 
         # refresh ceph.conf files for all mons + first mgr
         """