rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-22 21:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

pageserver: fix a compilation error (#8487)

Browse Source 
## Problem
PR that modified compaction raced with PR that modified the GcInfo
structure

## Summary of changes
Fix it

Co-authored-by: Vlad Lazar <vlalazar.vlad@gmail.com>
This commit is contained in:
John Spray
2024-07-24 16:37:15 +01:00
committed by GitHub
parent 2723a8156a
commit 5f4e14d27d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pageserver/src/tenant.rs
View File

@@ -7470,7 +7470,10 @@ mod tests {
// Update GC info // Update GC info
let mut guard = tline.gc_info.write().unwrap(); let mut guard = tline.gc_info.write().unwrap();
*guard = GcInfo { *guard = GcInfo {
retain_lsns: vec![Lsn(0x10), Lsn(0x20)], retain_lsns: vec![
(Lsn(0x10), tline.timeline_id),
(Lsn(0x20), tline.timeline_id),
],
cutoffs: GcCutoffs { cutoffs: GcCutoffs {
time: Lsn(0x30), time: Lsn(0x30),
space: Lsn(0x30), space: Lsn(0x30),

2
pageserver/src/tenant/timeline/compaction.rs
View File

@@ -1254,7 +1254,7 @@ impl Timeline {
let gc_info = self.gc_info.read().unwrap(); let gc_info = self.gc_info.read().unwrap();
let mut retain_lsns_below_horizon = Vec::new(); let mut retain_lsns_below_horizon = Vec::new();
let gc_cutoff = gc_info.cutoffs.select_min(); 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 { if lsn < &gc_cutoff {
retain_lsns_below_horizon.push(*lsn); retain_lsns_below_horizon.push(*lsn);
} }