From: Neha Ojha <nojha@redhat.com>
Date: Wed, 24 Jun 2020 00:18:04 +0000 (-0700)
Subject: Merge pull request #32855 from jdurgin/wip-message-cap
X-Git-Tag: v16.1.0~1972
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=405d1376a109b2aaed55a4c18b70bd0a0b8d5d43;p=ceph.git

Merge pull request #32855 from jdurgin/wip-message-cap

osd: make message cap option usable again

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
---

405d1376a109b2aaed55a4c18b70bd0a0b8d5d43
diff --cc src/ceph_osd.cc
index 4c051de5bc84,e0f006593480..ee93b0b85050
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@@ -589,10 -577,10 +592,10 @@@ flushjournal_out
      CEPH_FEATURE_PGID64 |
      CEPH_FEATURE_OSDENC;
  
 -  ms_public->set_default_policy(Messenger::Policy::stateless_server(0));
 +  ms_public->set_default_policy(Messenger::Policy::stateless_registered_server(0));
    ms_public->set_policy_throttlers(entity_name_t::TYPE_CLIENT,
  				   client_byte_throttler.get(),
- 				   nullptr);
+ 				   client_msg_throttler.get());
    ms_public->set_policy(entity_name_t::TYPE_MON,
                          Messenger::Policy::lossy_client(osd_required));
    ms_public->set_policy(entity_name_t::TYPE_MGR,