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 <idryomov@gmail.com>
(cherry picked from commit 7b5e16130afc4b89c934fb95c805eb2e369cd29a)

Conflicts:
	PendingReleaseNotes [ moved to >=16.2.12 section ]

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index f5af91d7d1acfd4d4ba22b3cfb1afcf809b06890..cba4e03dde72580d58d0b3e171116f4ad3d30178 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -32,11 +32,18 @@
   in certain recovery scenarios, e.g., monitor database lost and rebuilt, and
   the restored file system is expected to have the same ID as before.
 
+>=16.2.12
+---------
+
 * CEPHFS: Rename the `mds_max_retries_on_remount_failure` option to
   `client_max_retries_on_remount_failure` and move it from mds.yaml.in to
   mds-client.yaml.in because this option was only used by MDS client from its
   birth.
 
+* `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.
+
 >=16.2.11
 --------
 

diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h
index 5342fc51fc3deda4e013fa88672e182e86064914..c06a691b04add583673b3f46f57825734ce02486 100644 (file)
--- 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<MgrMap*> &l) {