]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.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>
Mon, 7 Jan 2019 23:33:56 +0000 (15:33 -0800)
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>
src/mon/OSDMonitor.cc

index 545855b9c64f2f40012c3d2470e3d7b52d76ddc9..38281fadf1982f2344eccdf9d405590e649b970e 100644 (file)
@@ -2832,6 +2832,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)) {
@@ -10094,6 +10096,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
         err = -EPERM;
         goto reply;
       }
+      // 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 &&
          (HAVE_FEATURE(osdmap.get_up_osd_features(), OSD_PGLOG_HARDLIMIT)
           || sure)) {