From 5f4e14d27d46a0c35bf4efc25d6a78ccbc7b3097 Mon Sep 17 00:00:00 2001 From: John Spray Date: Wed, 24 Jul 2024 16:37:15 +0100 Subject: [PATCH] pageserver: fix a compilation error (#8487) ## Problem PR that modified compaction raced with PR that modified the GcInfo structure ## Summary of changes Fix it Co-authored-by: Vlad Lazar --- pageserver/src/tenant.rs | 5 ++++- pageserver/src/tenant/timeline/compaction.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs index a98a32de35..f83c7021e3 100644 --- a/pageserver/src/tenant.rs +++ b/pageserver/src/tenant.rs @@ -7470,7 +7470,10 @@ mod tests { // Update GC info let mut guard = tline.gc_info.write().unwrap(); *guard = GcInfo { - retain_lsns: vec![Lsn(0x10), Lsn(0x20)], + retain_lsns: vec![ + (Lsn(0x10), tline.timeline_id), + (Lsn(0x20), tline.timeline_id), + ], cutoffs: GcCutoffs { time: Lsn(0x30), space: Lsn(0x30), diff --git a/pageserver/src/tenant/timeline/compaction.rs b/pageserver/src/tenant/timeline/compaction.rs index fb8c125b60..d0a74e3924 100644 --- a/pageserver/src/tenant/timeline/compaction.rs +++ b/pageserver/src/tenant/timeline/compaction.rs @@ -1254,7 +1254,7 @@ impl Timeline { let gc_info = self.gc_info.read().unwrap(); let mut retain_lsns_below_horizon = Vec::new(); let gc_cutoff = gc_info.cutoffs.select_min(); - for lsn in &gc_info.retain_lsns { + for (lsn, _timeline_id) in &gc_info.retain_lsns { if lsn < &gc_cutoff { retain_lsns_below_horizon.push(*lsn); }