From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 22 Sep 2017 04:32:13 +0000 (+0800)
Subject: Merge pull request #17374 from jcsp/wip-mgr-config-tidy
X-Git-Tag: v13.0.1~834
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab22dd4ee4d3671f4381444564e95f55325a0366;p=ceph.git

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

ab22dd4ee4d3671f4381444564e95f55325a0366
diff --cc src/mon/Monitor.cc
index 9e61db62cc56,18c38a34ef24..325698eb9e69
--- a/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;