osd/OSDMap: octopus encoding features

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 0c10811a88f58d2aaf58c16990a4988d872fce50..d5de1ee66a0ed6d54131ac069f76ee0ec5173798 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2528,6 +2528,9 @@ bool OSDMap::primary_changed(
 uint64_t OSDMap::get_encoding_features() const
 {
   uint64_t f = SIGNIFICANT_FEATURES;
+  if (require_osd_release < CEPH_RELEASE_OCTOPUS) {
+    f &= ~CEPH_FEATURE_SERVER_OCTOPUS;
+  }
   if (require_osd_release < CEPH_RELEASE_NAUTILUS) {
     f &= ~CEPH_FEATURE_SERVER_NAUTILUS;
   }