From: Neha Ojha <nojha@redhat.com>
Date: Mon, 7 Jan 2019 23:26:27 +0000 (-0800)
Subject: mon/OSDMonitor.cc: make a note about reusing jewel feature bit
X-Git-Tag: v12.2.11~13^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6545c34f133b8bb973f4173c03bd66768fb7fa4e;p=ceph.git

mon/OSDMonitor.cc: make a note about reusing jewel feature bit

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)

Conflicts:
	src/mon/OSDMonitor.cc: trivial resolution
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5710c3ea612..88087b2f0f7 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2517,6 +2517,8 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op)
     }
   }
 
+  // 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)) {
@@ -9383,6 +9385,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 == "--yes-i-really-mean-it")) {