]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls" 32997/head
authorNeha <nojha@redhat.com>
Tue, 28 Jan 2020 18:24:55 +0000 (18:24 +0000)
committerNeha Ojha <nojha@redhat.com>
Thu, 30 Jan 2020 21:04:26 +0000 (13:04 -0800)
Makes it easier to know what the always_on_modules for each release are, without
having to look at the code.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 8aa3c65b56add413d3fba1cb1d0cf84a10bfcf3c)

src/mon/MgrMonitor.cc

index 80e4121c43276cfb32c643cfd8fd00b86ef134a1..41c4d94aefea7ffdd5d706951990fb6c8ccad50b 100644 (file)
@@ -874,6 +874,11 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op)
   } else if (prefix == "mgr module ls") {
     f->open_object_section("modules");
     {
+      f->open_array_section("always_on_modules");
+      for (auto& p : map.get_always_on_modules()) {
+        f->dump_string("module", p);
+      }
+      f->close_section();
       f->open_array_section("enabled_modules");
       for (auto& p : map.modules) {
         if (map.get_always_on_modules().count(p) > 0)