]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor.cc: make a note about reusing jewel feature bit
authorNeha Ojha <nojha@redhat.com>
Mon, 7 Jan 2019 23:26:27 +0000 (15:26 -0800)
committerNeha Ojha <nojha@redhat.com>
Tue, 29 Jan 2019 00:48:29 +0000 (00:48 +0000)
For OSD_PGLOG_HARDLIMIT, we have reused a jewel feature bit that was retired
in luminous. Therefore, we need to check the release version for
>= CEPH_RELEASE_LUMINOUS, before using it.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 6abcc20dca0ee5a08a3fe7c560750f904fe3fa65)

src/mon/OSDMonitor.cc

index 803ca0d15822f1d95c204dd6a2e9bd09d6763014..492dfc8989b778ab6dabd855476a81797c91d394 100644 (file)
@@ -2734,6 +2734,8 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op)
     goto ignore;
   }
 
+  // The release check here is required because for OSD_PGLOG_HARDLIMIT,
+  // we are reusing a jewel feature bit that was retired in luminous.
   if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
       osdmap.test_flag(CEPH_OSDMAP_PGLOG_HARDLIMIT) &&
       !(m->osd_features & CEPH_FEATURE_OSD_PGLOG_HARDLIMIT)) {