From 7b5e16130afc4b89c934fb95c805eb2e369cd29a Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 6 Feb 2023 17:56:00 +0100 Subject: [PATCH] mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level 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 --- PendingReleaseNotes | 3 +++ src/mon/MgrMap.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 386f792bf5756..d06c2492071d5 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -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 diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h index 5342fc51fc3de..c06a691b04add 100644 --- a/src/mon/MgrMap.h +++ b/src/mon/MgrMap.h @@ -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 &l) { -- 2.39.5