fix clippy

Signed-off-by: Alex Chi Z <chi@neon.tech>
neondatabase · Jun 24, 2024 · 504c9a6 · 504c9a6
1 parent c9e56b5
commit 504c9a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs
@@ -1706,7 +1706,6 @@ async fn timeline_compact_handler(
         if !cfg!(feature = "testing") {
             return Err(ApiError::InternalServerError(
                 anyhow!("enhanced_gc_bottom_most_compaction is only available in testing mode")
-                    .into(),
             ));
         }
         flags |= CompactFlags::EnhancedGcBottomMostCompaction;

diff --git a/pageserver/src/tenant/timeline/compaction.rs b/pageserver/src/tenant/timeline/compaction.rs
@@ -981,8 +981,7 @@ impl Timeline {
             let guard = self.layers.read().await;
             let layers = guard.layer_map();
             let gc_info = self.gc_info.read().unwrap();
-            if !gc_info.retain_lsns.is_empty() {
-                // TODO: add lease LSNs
+            if !gc_info.retain_lsns.is_empty() || !gc_info.leases.is_empty() {
                 return Err(CompactionError::Other(anyhow!(
                     "enhanced legacy compaction currently does not support retain_lsns (branches)"
                 )));