diff options
| author | Sage Weil <sage@redhat.com> | 2020-01-29 14:46:38 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2020-01-29 14:46:38 +0100 |
| commit | 4fa9397841210ed567dc040037dda9f0b3719d89 (patch) | |
| tree | 47ce2131fad15ce62373b2391aac6bab2fc6b128 | |
| parent | Merge PR #32823 into master (diff) | |
| parent | mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls" (diff) | |
| download | ceph-4fa9397841210ed567dc040037dda9f0b3719d89.tar.xz ceph-4fa9397841210ed567dc040037dda9f0b3719d89.zip | |
Merge PR #32939 into master
* refs/pull/32939/head:
mon/MgrMonitor.cc: add always_on_modules to the output of "ceph mgr module ls"
Reviewed-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | src/mon/MgrMonitor.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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) |