RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level

Browse Source 
Currently last_failure_osd_epoch and active_clients are dumped in the
always_on_modules dictionary in "ceph mgr dump" output.  This goes back
to when these fields were added in commits f2986a4400bb ("mon/MgrMonitor:
blacklist previous instance") and df507cde8d71 ("mgr: forward RADOS
client instances for potential blacklist") but is wrong as these fields
have nothing to do with always-on modules.

Fixes: https://tracker.ceph.com/issues/58647
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2023-02-06 17:56:00 +01:00
parent d56c21fe4a
commit 7b5e16130a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PendingReleaseNotes
View File

@ -110,6 +110,9 @@
unlabeled perf counters may become labeled in future releases
and as such will no longer be emitted by the `perf dump` and `perf schema`
commands.
* `ceph mgr dump` command now outputs `last_failure_osd_epoch` and
`active_clients` fields at the top level. Previously, these fields were
output under `always_on_modules` field.
>=17.2.1

4
src/mon/MgrMap.h
View File

@ -514,13 +514,13 @@ public:
}
f->close_section();
}
f->close_section(); // always_on_modules
f->dump_int("last_failure_osd_epoch", last_failure_osd_epoch);
f->open_array_section("active_clients");
for (const auto &c : clients) {
f->dump_object("client", c);
}
f->close_section();
f->close_section();
f->close_section(); // active_clients
}
static void generate_test_instances(std::list<MgrMap*> &l) {