]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/OSDMonitor: encode without MIMIC if require_osd_release < mimic
authorSage Weil <sage@redhat.com>
Tue, 29 Aug 2017 03:43:06 +0000 (23:43 -0400)
committerSage Weil <sage@redhat.com>
Wed, 6 Sep 2017 14:18:06 +0000 (10:18 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 16412512dcb5e4bfe046bca307899c20e50979da..2cae5af4eb07a7463300c0ca2a88c7046c10945a 100644 (file)
@@ -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;