From 4bfaf2307e22b9e5aa0e2dbc42866415d30e9428 Mon Sep 17 00:00:00 2001 From: Neha Date: Tue, 28 Jan 2020 18:24:55 +0000 Subject: [PATCH] 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 (cherry picked from commit 8aa3c65b56add413d3fba1cb1d0cf84a10bfcf3c) --- src/mon/MgrMonitor.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 80e4121c432..41c4d94aefe 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -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) -- 2.47.3