From: Neha <nojha@redhat.com>
Date: Tue, 28 Jan 2020 18:24:55 +0000 (+0000)
Subject: mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"
X-Git-Tag: v15.1.0~8^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8aa3c65b56add413d3fba1cb1d0cf84a10bfcf3c;p=ceph-ci.git

mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"

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>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 515c3467c1b..e30a47338da 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -928,6 +928,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)