osd/PeeringState: introduce osd_skip_check_past_interval_bounds

Fixes: https://tracker.ceph.com/issues/64002
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 87a596e4e26064b85e7da4d58484d52231e8c877)

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index cc402e9de1d4a751c1eea6e28387673bfce9a48b..e057a80d18bdbefc0f7bb78ee91494f765e3a8c8 100644 (file)
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -3221,6 +3221,12 @@ options:
   level: dev
   default: false
   with_legacy: true
+- name: osd_skip_check_past_interval_bounds
+  type: bool
+  level: dev
+  desc: See https://tracker.ceph.com/issues/64002
+  default: false
+  with_legacy: true
 - name: osd_debug_pretend_recovery_active
   type: bool
   level: dev

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index d3d68557c1039a0051486921806bdfe750cf8249..cecabaf41d965cda210f6b27366c5819769e3a77 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -930,6 +930,10 @@ static pair<epoch_t, epoch_t> get_required_past_interval_bounds(
 
 void PeeringState::check_past_interval_bounds() const
 {
+  // See: https://tracker.ceph.com/issues/64002
+  if (cct->_conf.get_val<bool>("osd_skip_check_past_interval_bounds")) {
+    return;
+  }
   // cluster_osdmap_trim_lower_bound gives us a bound on needed
   // intervals, see doc/dev/osd_internals/past_intervals.rst
   auto oldest_epoch = pl->cluster_osdmap_trim_lower_bound();