From 73d94663895431de60357e93d4d66f16e307147a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Mar 2021 17:27:08 -0400 Subject: [PATCH] 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 (cherry picked from commit 2bd11c4ceb156a398423e4f7ee3131624a86f810) --- src/pybind/mgr/cephadm/serve.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 121cb3912ee7a..d6711d91f3176 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] -- 2.39.5