diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-13 11:27:11 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-13 11:27:11 -0800 |
| commit | fbbbd01bfe657acac1e129a2cc4630c039cf4cf3 (patch) | |
| tree | 968a01eb83c6c75c63467cc24134fde76aad854a /src/ceph_osd.cc | |
| parent | af38ce1f7ca3f61a9cae0cbfa0f0898879ac49b2 (diff) | |
| download | ceph-fbbbd01bfe657acac1e129a2cc4630c039cf4cf3.tar.gz | |
add CEPH_FEATURE_OSDENC
Require it for osd <-> osd and osd <-> mon communication.
This covers all the new encoding changes, except hobject_t, which is used
between the rados command line tool and the OSD for a object listing
position marker. We can't distinguish between specific types of clients,
though, and we don't want to introduce any incompatibility with other
clients, so we'll just have to make do here. :(
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/ceph_osd.cc')
| -rw-r--r-- | src/ceph_osd.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index d26f8669b8f..110234a46dd 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -341,7 +341,8 @@ int main(int argc, const char **argv) client_messenger->set_policy(entity_name_t::TYPE_MON, SimpleMessenger::Policy::client(supported, CEPH_FEATURE_UID | - CEPH_FEATURE_PGID64)); + 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)); @@ -351,7 +352,8 @@ int main(int argc, const char **argv) cluster_messenger->set_policy(entity_name_t::TYPE_OSD, SimpleMessenger::Policy::lossless_peer(supported, CEPH_FEATURE_UID | - CEPH_FEATURE_PGID64)); + CEPH_FEATURE_PGID64 | + CEPH_FEATURE_OSDENC)); cluster_messenger->set_policy(entity_name_t::TYPE_CLIENT, SimpleMessenger::Policy::stateless_server(0, 0)); |