diff options
| author | Sage Weil <sage.weil@dreamhost.com> | 2012-02-18 21:48:50 -0800 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-02-18 22:12:26 -0800 |
| commit | 1f5e446d8a9870f779f27ae833c9bcfc189051c8 (patch) | |
| tree | 756da446f10d3221c425830f831e9cc696715e5a /src/ceph_osd.cc | |
| parent | 10016923c9b782adfb15efa4e9cf27a80aa758dd (diff) | |
| download | ceph-1f5e446d8a9870f779f27ae833c9bcfc189051c8.tar.gz | |
msgr: promote SimpleMessenger::Policy to Messenger::Policy
This is part of the generic interface, not specific to the implementation.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/ceph_osd.cc')
| -rw-r--r-- | src/ceph_osd.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 25bf0b68aa1..a99cc7b99b3 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -344,28 +344,28 @@ int main(int argc, const char **argv) CEPH_FEATURE_NOSRCADDR | CEPH_FEATURE_PGID64; - client_messenger->set_default_policy(SimpleMessenger::Policy::stateless_server(supported, 0)); + client_messenger->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); client_messenger->set_policy(entity_name_t::TYPE_CLIENT, - SimpleMessenger::Policy::stateless_server(supported, 0)); + Messenger::Policy::stateless_server(supported, 0)); client_messenger->set_policy_throttler(entity_name_t::TYPE_CLIENT, &client_throttler); client_messenger->set_policy(entity_name_t::TYPE_MON, - SimpleMessenger::Policy::client(supported, - CEPH_FEATURE_UID | - CEPH_FEATURE_PGID64 | - CEPH_FEATURE_OSDENC)); + Messenger::Policy::client(supported, + CEPH_FEATURE_UID | + CEPH_FEATURE_PGID64 | + CEPH_FEATURE_OSDENC)); //try to poison pill any OSD connections on the wrong address client_messenger->set_policy(entity_name_t::TYPE_OSD, - SimpleMessenger::Policy::stateless_server(0,0)); - - cluster_messenger->set_default_policy(SimpleMessenger::Policy::stateless_server(0, 0)); - cluster_messenger->set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::client(0,0)); + Messenger::Policy::stateless_server(0,0)); + + cluster_messenger->set_default_policy(Messenger::Policy::stateless_server(0, 0)); + cluster_messenger->set_policy(entity_name_t::TYPE_MON, Messenger::Policy::client(0,0)); cluster_messenger->set_policy(entity_name_t::TYPE_OSD, - SimpleMessenger::Policy::lossless_peer(supported, - CEPH_FEATURE_UID | - CEPH_FEATURE_PGID64 | - CEPH_FEATURE_OSDENC)); + Messenger::Policy::lossless_peer(supported, + CEPH_FEATURE_UID | + CEPH_FEATURE_PGID64 | + CEPH_FEATURE_OSDENC)); cluster_messenger->set_policy(entity_name_t::TYPE_CLIENT, - SimpleMessenger::Policy::stateless_server(0, 0)); + Messenger::Policy::stateless_server(0, 0)); // Set up crypto, daemonize, etc. // Leave stderr open in case we need to report errors. |