fix tests + fmt

Signed-off-by: Alex Chi Z <[email protected]>
neondatabase · Jul 23, 2024 · 6f9685b · 6f9685b
1 parent d4f4a7c
commit 6f9685b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs
@@ -7341,7 +7341,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_simple_bottom_most_compaction_with_retain_lsns() -> anyhow::Result<()> {
-        let harness = TenantHarness::create("test_simple_bottom_most_compaction_with_retain_lsns").await?;
+        let harness =
+            TenantHarness::create("test_simple_bottom_most_compaction_with_retain_lsns").await?;
         let (tenant, ctx) = harness.load().await;
 
         fn get_key(id: u32) -> Key {

diff --git a/pageserver/src/tenant/timeline/compaction.rs b/pageserver/src/tenant/timeline/compaction.rs
@@ -1281,7 +1281,11 @@ impl Timeline {
         if cfg!(debug_assertions) {
             assert_eq!(
                 lowest_retain_lsn,
-                *retain_lsns_below_horizon.iter().min().unwrap()
+                *retain_lsns_below_horizon
+                    .iter()
+                    .min()
+                    .copied()
+                    .unwrap_or(gc_cutoff)
             );
         }
         info!(