From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 11 Jan 2024 13:59:43 +0000 (+0000)
Subject: osd/PeeringState: introduce osd_skip_check_past_interval_bounds
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~356^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=87a596e4e26064b85e7da4d58484d52231e8c877;p=ceph-ci.git

osd/PeeringState: introduce osd_skip_check_past_interval_bounds

Fixes: https://tracker.ceph.com/issues/64002

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index 286a1126a46..e1c06e2402f 100644
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -3228,6 +3228,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 c81cb958a7a..68b427bff2e 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -922,6 +922,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();