From 224c2146d47e6158e6af5ddaeed79010ef836c86 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki@neon.tech>
Date: Tue, 10 May 2022 16:08:59 +0300
Subject: [PATCH] Fix bugs in the merge with origin/main, to make it compile

---
 pageserver/src/layered_repository/delta_layer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageserver/src/layered_repository/delta_layer.rs b/pageserver/src/layered_repository/delta_layer.rs
index 575b1df82e..f94b65b25e 100644
--- a/pageserver/src/layered_repository/delta_layer.rs
+++ b/pageserver/src/layered_repository/delta_layer.rs
@@ -392,7 +392,7 @@ impl Layer for DeltaLayer {
 
         // A subroutine to dump a single blob
         let mut dump_blob = |blob_ref: BlobRef| -> anyhow::Result<String> {
-            let buf = cursor.read_blob(pos).with_context(|| {
+            let buf = cursor.read_blob(blob_ref.pos()).with_context(|| {
                 format!(
                     "Failed to read blob from virtual file {}",
                     file.file.path.display()
@@ -422,7 +422,7 @@ impl Layer for DeltaLayer {
                     format!(" img {} bytes", img.len())
                 }
                 Value::WalRecord(rec) => {
-                    let wal_desc = walrecord::describe_wal_record(&rec);
+                    let wal_desc = walrecord::describe_wal_record(&rec)?;
                     format!(
                         " rec {} bytes will_init: {} {}",
                         buf.len(),