diff options
| author | Venky Shankar <vshankar@redhat.com> | 2020-02-08 04:01:30 +0100 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2020-02-18 05:45:45 +0100 |
| commit | 20139d12423fc6154b57499c576d1e4bb3f1eade (patch) | |
| tree | 5c77935e41230b793d8145d7cded23c92ce9a554 /src/mgr | |
| parent | mgr: helper function to check if a service is a normal ceph service (diff) | |
| download | ceph-20139d12423fc6154b57499c576d1e4bb3f1eade.tar.xz ceph-20139d12423fc6154b57499c576d1e4bb3f1eade.zip | |
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 <vshankar@redhat.com>
Diffstat (limited to 'src/mgr')
| -rw-r--r-- | src/mgr/DaemonServer.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 8bbac965151..08b895bc197 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<std::string> types; for (auto& [type, service] : pending_service_map.services) { + if (ServiceMap::is_normal_ceph_entity(type)) { + continue; + } + types.insert(type); std::set<std::string> names; |