Merge pull request #17374 from jcsp/wip-mgr-config-tidy

mgr: use new style config opts + add metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/mgr/DaemonServer.cc
Simple merge

diff --cc src/mgr/PyModules.cc
Simple merge

diff --cc src/mon/Monitor.cc
index 9e61db62cc5660e15cfb3d5a29373890886e5d95,18c38a34ef245d8f858c2aa29583c3ed93c2df10..325698eb9e69c17f188d6f3e97c0c91510e9fa77
--- 1/src/mon/Monitor.cc
--- 2/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@@ -2998,11 -3006,12 +2998,11 @@@ void Monitor::handle_command(MonOpReque
      << "entity='" << session->entity_name << "' "
      << "cmd=" << m->cmd << ": dispatch";
  
 -  if (mon_cmd->is_mgr() &&
 -      osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
 +  if (mon_cmd->is_mgr()) {
      const auto& hdr = m->get_header();
      uint64_t size = hdr.front_len + hdr.middle_len + hdr.data_len;
-     uint64_t max =
-       g_conf->mon_client_bytes * g_conf->mon_mgr_proxy_client_bytes_ratio;
+     uint64_t max = g_conf->get_val<uint64_t>("mon_client_bytes")
+                  * g_conf->get_val<double>("mon_mgr_proxy_client_bytes_ratio");
      if (mgr_proxy_bytes + size > max) {
        dout(10) << __func__ << " current mgr proxy bytes " << mgr_proxy_bytes
               << " + " << size << " > max " << max << dendl;