From dd3178836d6e650912108126f2c8e6fbdf124c7e Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Thu, 10 Apr 2025 08:58:06 +0200
Subject: [PATCH] REVIEW: minor nits

---
 pageserver/src/tenant/blob_io.rs                            | 2 +-
 pageserver/src/tenant/remote_timeline_client/download.rs    | 2 +-
 pageserver/src/tenant/storage_layer/delta_layer.rs          | 4 ++--
 pageserver/src/virtual_file/owned_buffers_io/write/flush.rs | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pageserver/src/tenant/blob_io.rs b/pageserver/src/tenant/blob_io.rs
index af250bf718..2f453e9d77 100644
--- a/pageserver/src/tenant/blob_io.rs
+++ b/pageserver/src/tenant/blob_io.rs
@@ -235,7 +235,7 @@ impl BlobWriter {
         ctx: &RequestContext,
         algorithm: ImageCompressionAlgorithm,
     ) -> (FullSlice<Buf>, Result<(u64, CompressionInfo), Error>) {
-        let offset = self.size();
+        let offset = self.offset;
         let mut compression_info = CompressionInfo {
             written_compressed: false,
             compressed_size: None,
diff --git a/pageserver/src/tenant/remote_timeline_client/download.rs b/pageserver/src/tenant/remote_timeline_client/download.rs
index 854a18cec1..c7de87e355 100644
--- a/pageserver/src/tenant/remote_timeline_client/download.rs
+++ b/pageserver/src/tenant/remote_timeline_client/download.rs
@@ -245,7 +245,7 @@ async fn download_object(
                         };
                         buffered.write_buffered_borrowed(&chunk, ctx).await?;
                     }
-                    let inner = buffered.shutdown(|_| None).await?;
+                    let inner = buffered.shutdown(|_| None).await?; // TODO: if we leave handle_tail=None here, it means we'll cut off layers that aren't a tail sz multiple
                     Ok(inner)
                 }
                 .await?;
diff --git a/pageserver/src/tenant/storage_layer/delta_layer.rs b/pageserver/src/tenant/storage_layer/delta_layer.rs
index bb101784d3..23c237b030 100644
--- a/pageserver/src/tenant/storage_layer/delta_layer.rs
+++ b/pageserver/src/tenant/storage_layer/delta_layer.rs
@@ -772,7 +772,7 @@ impl Drop for DeltaLayerWriter {
             {
                 Ok(vfile) => vfile,
                 Err(e) => {
-                    error!(err=%e, "failed to remove image layer writer file");
+                    error!(err=%e, "failed to remove delta layer writer file");
                     drop(_gate_guard);
                     return;
                 }
@@ -781,7 +781,7 @@ impl Drop for DeltaLayerWriter {
             if let Err(e) = std::fs::remove_file(vfile.path())
                 .maybe_fatal_err("failed to remove the virtual file")
             {
-                error!(err=%e, path=%vfile.path(), "failed to remove image layer writer file");
+                error!(err=%e, path=%vfile.path(), "failed to remove delta layer writer file");
             }
             drop(_gate_guard);
         });
diff --git a/pageserver/src/virtual_file/owned_buffers_io/write/flush.rs b/pageserver/src/virtual_file/owned_buffers_io/write/flush.rs
index ce9af0b06f..cdc8537b13 100644
--- a/pageserver/src/virtual_file/owned_buffers_io/write/flush.rs
+++ b/pageserver/src/virtual_file/owned_buffers_io/write/flush.rs
@@ -186,7 +186,7 @@ where
         Ok((recycled, flush_control))
     }
 
-    pub(super) async fn handle_error<T>(&mut self) -> std::io::Result<T> {
+    async fn handle_error<T>(&mut self) -> std::io::Result<T> {
         Err(self
             .shutdown()
             .await
@@ -196,7 +196,7 @@ where
 
     /// Cleans up the channel, join the flush task.
     pub async fn shutdown(&mut self) -> std::io::Result<RequestContext> {
-        let handle = self
+        let handle: FlushHandleInner<Buf, W> = self
             .inner
             .take()
             .expect("must not use after we returned an error");