From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Mar 2021 21:27:08 +0000 (-0400)
Subject: mgr/cephadm: identify rgw, cepfs-mirror in servicemap
X-Git-Tag: v16.2.0~74^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40279%2Fhead;p=ceph.git

mgr/cephadm: identify rgw, cepfs-mirror in servicemap

Like rbd-mirror, cephfs-mirror and rgw daemons register under their gid.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2bd11c4ceb156a398423e4f7ee3131624a86f810)
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 121cb3912ee7..d6711d91f317 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -408,15 +408,18 @@ class CephadmServe:
                     daemon_id = s.get('id')
                     assert daemon_id
                     name = '%s.%s' % (s.get('type'), daemon_id)
-                    if s.get('type') == 'rbd-mirror':
+                    if s.get('type') in ['rbd-mirror', 'cephfs-mirror', 'rgw']:
                         metadata = self.mgr.get_metadata(
-                            "rbd-mirror", daemon_id, {})
+                            cast(str, s.get('type')), daemon_id, {})
                         assert metadata is not None
                         try:
                             name = '%s.%s' % (s.get('type'), metadata['id'])
                         except (KeyError, TypeError):
                             self.log.debug(
-                                "Failed to find daemon id for rbd-mirror service %s" % (s.get('id')))
+                                "Failed to find daemon id for %s service %s" % (
+                                    s.get('type'), s.get('id')
+                                )
+                            )
                     elif s.get('type') == 'rgw-nfs':
                         # https://tracker.ceph.com/issues/49573
                         name = daemon_id.split('-rgw')[0]