From 65fd7f82c9a94dbe9f0eefd8b1aaf769536a2e1d 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 (cherry picked from commit 20139d12423fc6154b57499c576d1e4bb3f1eade) Conflicts: src/mgr/DaemonServer.cc Switch to non-initializer list in range-based for loop. --- src/mgr/DaemonServer.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 75ff7c39685f7..cb57d13e65cfb 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -959,6 +959,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& p : pending_service_map.services) { + if (ServiceMap::is_normal_ceph_entity(p.first)) { + continue; + } + f->open_object_section(p.first.c_str()); for (auto& q : p.second.daemons) { f->open_object_section(q.first.c_str()); @@ -2754,6 +2758,10 @@ void DaemonServer::got_service_map() // cull missing daemons, populate new ones std::set types; for (auto& p : pending_service_map.services) { + if (ServiceMap::is_normal_ceph_entity(p.first)) { + continue; + } + types.insert(p.first); std::set names; -- 2.39.5