Skip to content

Commit 313b886

Browse files
authored
Merge pull request ceph#55147 from Matan-B/wip-matanb-skip-past-interval-cheeck
osd/PeeringState: introduce osd_skip_check_past_interval_bounds Reviewed-by athanatos
2 parents 06bcebf + 87a596e commit 313b886

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/common/options/global.yaml.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3248,6 +3248,12 @@ options:
32483248
level: dev
32493249
default: false
32503250
with_legacy: true
3251+
- name: osd_skip_check_past_interval_bounds
3252+
type: bool
3253+
level: dev
3254+
desc: See https://tracker.ceph.com/issues/64002
3255+
default: false
3256+
with_legacy: true
32513257
- name: osd_debug_pretend_recovery_active
32523258
type: bool
32533259
level: dev

src/osd/PeeringState.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,10 @@ static pair<epoch_t, epoch_t> get_required_past_interval_bounds(
922922

923923
void PeeringState::check_past_interval_bounds() const
924924
{
925+
// See: https://tracker.ceph.com/issues/64002
926+
if (cct->_conf.get_val<bool>("osd_skip_check_past_interval_bounds")) {
927+
return;
928+
}
925929
// cluster_osdmap_trim_lower_bound gives us a bound on needed
926930
// intervals, see doc/dev/osd_internals/past_intervals.rst
927931
auto oldest_epoch = pl->cluster_osdmap_trim_lower_bound();

0 commit comments

Comments
 (0)