From f38ed110cac5cd7202b7d25ac3f0a8ddecfcdfdc Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 13 Nov 2019 17:14:34 +0000
Subject: [PATCH] qa/tasks/ceph2: register_daemons after pods start

Signed-off-by: Sage Weil <sage@redhat.com>
---
 qa/tasks/ceph2.py | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py
index 66ea4f1a138..d1010dc1bbb 100644
--- a/qa/tasks/ceph2.py
+++ b/qa/tasks/ceph2.py
@@ -439,6 +439,7 @@ def ceph_mgrs(ctx, config):
 
     try:
         nodes = []
+        daemons = {}
         for remote, roles in ctx.cluster.remotes.items():
             for mgr in [r for r in roles
                         if teuthology.is_type('mgr', cluster_name)(r)]:
@@ -447,21 +448,22 @@ def ceph_mgrs(ctx, config):
                     continue
                 log.info('Adding %s on %s' % (mgr, remote.shortname))
                 nodes.append(remote.shortname + '=' + id_)
-
-                ctx.daemons.register_daemon(
-                    remote, 'mgr', id_,
-                    cluster=cluster_name,
-                    fsid=fsid,
-                    logger=log.getChild(mgr),
-                    wait=False,
-                    started=True,
-                )
-
+                daemons[mgr] = (remote, id_)
         if nodes:
             shell(ctx, cluster_name, remote, [
                 'ceph', 'orchestrator', 'mgr', 'update',
                 str(len(nodes) + 1)] + nodes
             )
+        for mgr, i in daemons.items():
+            remote, id_ = i
+            ctx.daemons.register_daemon(
+                remote, 'mgr', id_,
+                cluster=cluster_name,
+                fsid=fsid,
+                logger=log.getChild(mgr),
+                wait=False,
+                started=True,
+            )
 
         yield
 
@@ -528,27 +530,30 @@ def ceph_mdss(ctx, config):
     testdir = teuthology.get_testdir(ctx)
 
     nodes = []
+    daemons = {}
     for remote, roles in ctx.cluster.remotes.items():
         for role in [r for r in roles
                     if teuthology.is_type('mds', cluster_name)(r)]:
             c_, _, id_ = teuthology.split_role(role)
             log.info('Adding %s on %s' % (role, remote.shortname))
             nodes.append(remote.shortname + '=' + id_)
-            ctx.daemons.register_daemon(
-                remote, 'mds', id_,
-                cluster=cluster_name,
-                fsid=fsid,
-                logger=log.getChild(role),
-                wait=False,
-                started=True,
-            )
-
+            daemons[role] = (remote, id_)
     if nodes:
         shell(ctx, cluster_name, remote, [
             'ceph', 'orchestrator', 'mds', 'update',
             'all',
             str(len(nodes))] + nodes
         )
+    for role, i in daemons.items():
+        remote, id_ = i
+        ctx.daemons.register_daemon(
+            remote, 'mds', id_,
+            cluster=cluster_name,
+            fsid=fsid,
+            logger=log.getChild(role),
+            wait=False,
+            started=True,
+        )
 
     yield
 
-- 
2.39.5