v = 5;
} else if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
v = 6;
- } /* else if (!HAVE_FEATURE(features, SERVER_REEF)) {
+ } else if (!HAVE_FEATURE(features, SERVER_REEF)) {
v = 8;
- } */
+ }
ENCODE_START(v, 1, bl); // client-usable data
encode(fsid, bl);
encode(epoch, bl);
uint64_t OSDMap::get_encoding_features() const
{
uint64_t f = SIGNIFICANT_FEATURES;
+ if (require_osd_release < ceph_release_t::reef) {
+ f &= ~CEPH_FEATURE_SERVER_REEF;
+ }
if (require_osd_release < ceph_release_t::octopus) {
f &= ~CEPH_FEATURE_SERVER_OCTOPUS;
}
v = 6;
} else if (!HAVE_FEATURE(features, SERVER_NAUTILUS)) {
v = 7;
- } /* else if (!HAVE_FEATURE(features, SERVER_REEF)) {
+ } else if (!HAVE_FEATURE(features, SERVER_REEF)) {
v = 9;
- } */
+ }
ENCODE_START(v, 1, bl); // client-usable data
// base
encode(fsid, bl);
CEPH_FEATUREMASK_SERVER_LUMINOUS |
CEPH_FEATUREMASK_SERVER_MIMIC |
CEPH_FEATUREMASK_SERVER_NAUTILUS |
- CEPH_FEATUREMASK_SERVER_OCTOPUS;
+ CEPH_FEATUREMASK_SERVER_OCTOPUS |
+ CEPH_FEATUREMASK_SERVER_REEF;
struct addrs_s {
mempool::osdmap::vector<std::shared_ptr<entity_addrvec_t> > client_addrs;