]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop broken 'poison pill'
authorSage Weil <sage@redhat.com>
Fri, 28 Feb 2020 20:46:22 +0000 (14:46 -0600)
committerKefu Chai <kchai@redhat.com>
Sun, 1 Mar 2020 12:34:10 +0000 (20:34 +0800)
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 <sage@redhat.com>
src/ceph_osd.cc

index 3e03e8632396e461f45efa134aec0c4264d55e98..1e09474058aaa4d54b59df9cd1e240dcbe424d45 100644 (file)
@@ -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,