From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Aug 2017 03:43:06 +0000 (-0400)
Subject: mon/OSDMonitor: encode without MIMIC if require_osd_release < mimic
X-Git-Tag: v13.0.1~1005^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7649062edb350390ce4cfac87f4ea593b84be391;p=ceph.git

mon/OSDMonitor: encode without MIMIC if require_osd_release < mimic

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 16412512dcb..2cae5af4eb0 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1101,6 +1101,10 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
       dout(10) << __func__ << " encoding without feature SERVER_JEWEL" << dendl;
       features &= ~CEPH_FEATURE_SERVER_JEWEL;
     }
+    if (tmp.require_osd_release < CEPH_RELEASE_MIMIC) {
+      dout(10) << __func__ << " encoding without feature SERVER_MIMIC" << dendl;
+      features &= ~(CEPH_FEATURE_SERVER_MIMIC);
+    }
     dout(10) << __func__ << " encoding full map with " << features << dendl;
 
     bufferlist fullbl;