From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 22:33:02 +0000 (-0500)
Subject: osd/OSDMap: octopus encoding features
X-Git-Tag: v15.0.0^2~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c9a95a887c5807b6e26accbb84ed24561d545419;p=ceph-ci.git

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 0c10811a88f..d5de1ee66a0 100644
--- 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;
   }