From 6abcc20dca0ee5a08a3fe7c560750f904fe3fa65 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Mon, 7 Jan 2019 15:26:27 -0800 Subject: [PATCH] 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 --- src/mon/OSDMonitor.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 545855b9c64..38281fadf19 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -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)) { -- 2.47.3