From 4b236926159a8bcf074577bbd6e14146db4a0f85 Mon Sep 17 00:00:00 2001
From: Alex Chi Z <chi@neon.tech>
Date: Mon, 22 Apr 2024 14:19:25 -0400
Subject: [PATCH] adapt to metadataupdate interface

Signed-off-by: Alex Chi Z <chi@neon.tech>
---
 pageserver/ctl/src/main.rs                      |  2 +-
 pageserver/src/http/routes.rs                   |  4 +++-
 pageserver/src/tenant/metadata.rs               | 10 ++++++++++
 pageserver/src/tenant/remote_timeline_client.rs |  1 +
 pageserver/src/tenant/timeline.rs               |  2 --
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pageserver/ctl/src/main.rs b/pageserver/ctl/src/main.rs
index 00c410fba2..b53a50db9c 100644
--- a/pageserver/ctl/src/main.rs
+++ b/pageserver/ctl/src/main.rs
@@ -245,7 +245,7 @@ fn handle_metadata(
             meta.latest_gc_cutoff_lsn(),
             meta.initdb_lsn(),
             meta.pg_version(),
-            meta.aux_file_v2()
+            meta.aux_file_v2(),
         );
         update_meta = true;
     }
diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs
index 58c6a1699c..4cc031df71 100644
--- a/pageserver/src/http/routes.rs
+++ b/pageserver/src/http/routes.rs
@@ -427,7 +427,9 @@ async fn build_timeline_info_common(
 
         walreceiver_status,
 
-        aux_file_v2: timeline.aux_file_v2.load(std::sync::atomic::Ordering::SeqCst)
+        aux_file_v2: timeline
+            .aux_file_v2
+            .load(std::sync::atomic::Ordering::SeqCst),
     };
     Ok(info)
 }
diff --git a/pageserver/src/tenant/metadata.rs b/pageserver/src/tenant/metadata.rs
index 0fda370699..08fa6160dd 100644
--- a/pageserver/src/tenant/metadata.rs
+++ b/pageserver/src/tenant/metadata.rs
@@ -85,6 +85,7 @@ struct TimelineMetadataBodyV1 {
 }
 
 impl TimelineMetadata {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         disk_consistent_lsn: Lsn,
         prev_record_lsn: Option<Lsn>,
@@ -239,6 +240,7 @@ impl TimelineMetadata {
             Lsn::from_hex("00000000").unwrap(),
             Lsn::from_hex("00000000").unwrap(),
             0,
+            false,
         );
         let bytes = instance.to_bytes().unwrap();
         Self::from_bytes(&bytes).unwrap()
@@ -248,6 +250,7 @@ impl TimelineMetadata {
         self.body.disk_consistent_lsn = update.disk_consistent_lsn;
         self.body.prev_record_lsn = update.prev_record_lsn;
         self.body.latest_gc_cutoff_lsn = update.latest_gc_cutoff_lsn;
+        self.body.aux_file_v2 = if update.aux_file_v2 { Some(true) } else { None };
     }
 }
 
@@ -278,6 +281,7 @@ pub(crate) struct MetadataUpdate {
     disk_consistent_lsn: Lsn,
     prev_record_lsn: Option<Lsn>,
     latest_gc_cutoff_lsn: Lsn,
+    aux_file_v2: bool,
 }
 
 impl MetadataUpdate {
@@ -285,11 +289,13 @@ impl MetadataUpdate {
         disk_consistent_lsn: Lsn,
         prev_record_lsn: Option<Lsn>,
         latest_gc_cutoff_lsn: Lsn,
+        aux_file_v2: bool,
     ) -> Self {
         Self {
             disk_consistent_lsn,
             prev_record_lsn,
             latest_gc_cutoff_lsn,
+            aux_file_v2,
         }
     }
 }
@@ -310,6 +316,7 @@ mod tests {
             Lsn(0),
             // Any version will do here, so use the default
             crate::DEFAULT_PG_VERSION,
+            true,
         );
 
         let metadata_bytes = original_metadata
@@ -384,6 +391,7 @@ mod tests {
             Lsn(0),
             Lsn(0),
             14, // All timelines created before this version had pg_version 14
+            true,
         );
 
         assert_eq!(
@@ -404,6 +412,7 @@ mod tests {
             Lsn(0),
             // Any version will do here, so use the default
             crate::DEFAULT_PG_VERSION,
+            true,
         );
         let metadata_bytes = original_metadata
             .to_bytes()
@@ -457,6 +466,7 @@ mod tests {
             Lsn(0),
             // Any version will do here, so use the default
             crate::DEFAULT_PG_VERSION,
+            true,
         );
         let expected_bytes = vec![
             /* bincode length encoding bytes */
diff --git a/pageserver/src/tenant/remote_timeline_client.rs b/pageserver/src/tenant/remote_timeline_client.rs
index 1fa3badefb..5d7ccb84d8 100644
--- a/pageserver/src/tenant/remote_timeline_client.rs
+++ b/pageserver/src/tenant/remote_timeline_client.rs
@@ -1852,6 +1852,7 @@ mod tests {
             // Any version will do
             // but it should be consistent with the one in the tests
             crate::DEFAULT_PG_VERSION,
+            false,
         );
 
         // go through serialize + deserialize to fix the header, including checksum
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 3e4fddd01b..594d9495ef 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -3627,8 +3627,6 @@ impl Timeline {
             disk_consistent_lsn,
             ondisk_prev_record_lsn,
             *self.latest_gc_cutoff_lsn.read(),
-            self.initdb_lsn,
-            self.pg_version,
             self.aux_file_v2.load(AtomicOrdering::SeqCst),
         );