From f35dc155984ced5fd194a34622dd3efdeed9d497 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Thu, 17 Jul 2025 08:10:48 +0000 Subject: [PATCH] Revert "theorem: https://databricks.slack.com/archives/C09254R641L/p1752739636785699?thread_ts=1752738134.504099&cid=C09254R641L" This reverts commit e4b514e3445c9c0535b850a60719d3d4a9afe1d9. --- pageserver/src/tenant/timeline.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index a3797ba73d..4320f3b142 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -1835,14 +1835,11 @@ impl Timeline { // of GC blocking. let validate = { let conf = self.tenant_conf.load(); - //!conf.is_gc_blocked_by_lsn_lease_deadline() - !within_deadline + !conf.is_gc_blocked_by_lsn_lease_deadline() }; // Do not allow initial lease creation to be below the planned gc cutoff. The client (compute_ctl) determines // whether it is a initial lease creation or a renewal. - if !(is_renew && within_deadline) && lsn < planned_cutoff - if (!is_renew || !within_deadline) && lsn < planned_cutoff { if (init || validate) && lsn < planned_cutoff { bail!( "tried to request an lsn lease for an lsn below the planned gc cutoff. requested at {} planned gc cutoff {}",