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>

diff --cc src/ceph_osd.cc
index 4c051de5bc84db436da6a9ac870e982e0b92ab4a,e0f006593480abbb2c23b82aaf2dc43c7f48ba77..ee93b0b850508eb50d2706008f37c3f439b0a3e2
--- 1/src/ceph_osd.cc
--- 2/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,

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