From 20139d12423fc6154b57499c576d1e4bb3f1eade Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Fri, 7 Feb 2020 22:01:30 -0500 Subject: [PATCH] mgr: filter out normal ceph services when processing service map This is done is couple of places in ceph manager -- when culling entries from service map and the other when dumping serice status. Signed-off-by: Venky Shankar --- src/mgr/DaemonServer.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 8bbac9651516..08b895bc1979 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -964,6 +964,10 @@ bool DaemonServer::_handle_command( // only include state from services that are in the persisted service map f->open_object_section("service_status"); for (auto& [type, service] : pending_service_map.services) { + if (ServiceMap::is_normal_ceph_entity(type)) { + continue; + } + f->open_object_section(type.c_str()); for (auto& q : service.daemons) { f->open_object_section(q.first.c_str()); @@ -2741,6 +2745,10 @@ void DaemonServer::got_service_map() // cull missing daemons, populate new ones std::set types; for (auto& [type, service] : pending_service_map.services) { + if (ServiceMap::is_normal_ceph_entity(type)) { + continue; + } + types.insert(type); std::set names; -- 2.47.3