From fecefa0fc82d8fb7b386fdce580458370cf42430 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 11 Jan 2024 13:59:43 +0000 Subject: [PATCH] osd/PeeringState: introduce osd_skip_check_past_interval_bounds Fixes: https://tracker.ceph.com/issues/64002 Signed-off-by: Matan Breizman (cherry picked from commit 87a596e4e26064b85e7da4d58484d52231e8c877) --- src/common/options/global.yaml.in | 6 ++++++ src/osd/PeeringState.cc | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in index cc402e9de1d4..e057a80d18bd 100644 --- 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 d3d68557c103..cecabaf41d96 100644 --- a/src/osd/PeeringState.cc +++ b/src/osd/PeeringState.cc @@ -930,6 +930,10 @@ static pair get_required_past_interval_bounds( void PeeringState::check_past_interval_bounds() const { + // See: https://tracker.ceph.com/issues/64002 + if (cct->_conf.get_val("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(); -- 2.47.3