osd/OSDMap: make NAUTILUS feature bit significant

It's not actually significant to the encoding yet, but it will be, so put
this in place now.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 03e22ccd5ec94437c11ee700124449929e01d176..b182256253f274b8555ac7a4b8a78b87aa8742a1 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2383,6 +2383,9 @@ bool OSDMap::primary_changed(
 uint64_t OSDMap::get_encoding_features() const
 {
   uint64_t f = SIGNIFICANT_FEATURES;
+  if (require_osd_release < CEPH_RELEASE_NAUTILUS) {
+    f &= ~CEPH_FEATURE_SERVER_NAUTILUS;
+  }
   if (require_osd_release < CEPH_RELEASE_MIMIC) {
     f &= ~CEPH_FEATURE_SERVER_MIMIC;
   }

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 791c1a79f5a6fa90ac2f98292267414fbc662274..c2d83d1773bd798a588c9cfc56fb17e6c68d8c8d 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -520,7 +520,8 @@ private:
     CEPH_FEATUREMASK_CRUSH_TUNABLES5 |
     CEPH_FEATUREMASK_CRUSH_CHOOSE_ARGS |
     CEPH_FEATUREMASK_SERVER_LUMINOUS |
-    CEPH_FEATUREMASK_SERVER_MIMIC;
+    CEPH_FEATUREMASK_SERVER_MIMIC |
+    CEPH_FEATUREMASK_SERVER_NAUTILUS;
 
   struct addrs_s {
     mempool::osdmap::vector<ceph::shared_ptr<entity_addr_t> > client_addr;