From: Neha Ojha Date: Thu, 20 Dec 2018 17:27:34 +0000 (-0800) Subject: mon: add and use OSD_PGLOG_HARDLIMIT feature bit X-Git-Tag: v13.2.5~52^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e1b715d8937ea9c78bbd870beaeb798c142f2ee;p=ceph.git mon: add and use OSD_PGLOG_HARDLIMIT feature bit Signed-off-by: Neha Ojha (cherry picked from commit 6b0a3ded5baabb19809618de16cdf67c925a8e5a) --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 60bc1f3dee72..eb17ac6a2f92 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -94,6 +94,7 @@ DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(17, 3, OS_PERF_STAT_NS) DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES) DEFINE_CEPH_FEATURE_RETIRED(19, 1, CHUNKY_SCRUB, JEWEL, LUMINOUS) +DEFINE_CEPH_FEATURE(19, 2, OSD_PGLOG_HARDLIMIT) DEFINE_CEPH_FEATURE_RETIRED(20, 1, MON_NULLROUTE, JEWEL, LUMINOUS) @@ -232,6 +233,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_SERVER_MIMIC | \ CEPH_FEATURE_RECOVERY_RESERVATION_2 | \ CEPH_FEATURE_CEPHX_V2 | \ + CEPH_FEATURE_OSD_PGLOG_HARDLIMIT | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index d218b28e4607..803ca0d15822 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2734,7 +2734,8 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) goto ignore; } - if (osdmap.test_flag(CEPH_OSDMAP_PGLOG_HARDLIMIT) && + if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS && + osdmap.test_flag(CEPH_OSDMAP_PGLOG_HARDLIMIT) && !(m->osd_features & CEPH_FEATURE_OSD_PGLOG_HARDLIMIT)) { mon->clog->info() << "disallowing boot of OSD " << m->get_orig_source_inst()