From c16566cc9a56fe2d821bfc4d4b8624c3c7b38614 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 26 Aug 2017 15:22:15 -0400 Subject: [PATCH] mon: drop hide_mgr_flag behavior Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 11 ++--------- src/mon/Monitor.h | 3 +-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 7a79723153bc3..9f0a3560c64d0 100755 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -2762,16 +2762,12 @@ bool Monitor::_allowed_command(MonSession *s, string &module, string &prefix, void Monitor::format_command_descriptions(const std::vector &commands, Formatter *f, - bufferlist *rdata, - bool hide_mgr_flag) + bufferlist *rdata) { int cmdnum = 0; f->open_object_section("command_descriptions"); for (const auto &cmd : commands) { unsigned flags = cmd.flags; - if (hide_mgr_flag) { - flags &= ~MonCommand::FLAG_MGR; - } ostringstream secname; secname << "cmd" << setfill('0') << std::setw(3) << cmdnum; dump_cmddesc_to_json(f, secname.str(), @@ -2870,9 +2866,6 @@ void Monitor::handle_command(MonOpRequestRef op) if (prefix == "get_command_descriptions") { bufferlist rdata; Formatter *f = Formatter::create("json"); - // hide mgr commands until luminous upgrade is complete - bool hide_mgr_flag = - osdmon()->osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS; std::vector commands = static_cast( paxos_service[PAXOS_MGR])->get_command_descs(); @@ -2881,7 +2874,7 @@ void Monitor::handle_command(MonOpRequestRef op) commands.push_back(c); } - format_command_descriptions(commands, f, &rdata, hide_mgr_flag); + format_command_descriptions(commands, f, &rdata); delete f; reply_command(op, 0, "", rdata, 0); return; diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 7bd17021305b6..3aa63abf3fb0f 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -962,8 +962,7 @@ private: public: static void format_command_descriptions(const std::vector &commands, Formatter *f, - bufferlist *rdata, - bool hide_mgr_flag=false); + bufferlist *rdata); const std::vector &get_local_commands(mon_feature_t f) { return local_mon_commands; -- 2.39.5