From: Sage Weil Date: Fri, 28 Feb 2020 20:46:22 +0000 (-0600) Subject: osd: drop broken 'poison pill' X-Git-Tag: v15.1.1~168^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e05a07ded99ce0ee40ed60a498326e749b2c1b4d;p=ceph.git osd: drop broken 'poison pill' This was effectively a no-op, since the default policy was *also* stateless_server. This line originates from v0.24 (2010) when we added the cluster msgr. Signed-off-by: Sage Weil --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3e03e8632396..1e09474058aa 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -583,10 +583,6 @@ flushjournal_out: ms_public->set_policy(entity_name_t::TYPE_MGR, Messenger::Policy::lossy_client(osd_required)); - //try to poison pill any OSD connections on the wrong address - ms_public->set_policy(entity_name_t::TYPE_OSD, - Messenger::Policy::stateless_server(0)); - ms_cluster->set_default_policy(Messenger::Policy::stateless_server(0)); ms_cluster->set_policy(entity_name_t::TYPE_MON, Messenger::Policy::lossy_client(0)); ms_cluster->set_policy(entity_name_t::TYPE_OSD,