From ed28ced3bc463d6a8461c5539558d247fc33c77c Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Fri, 11 Nov 2022 11:55:28 -0500
Subject: [PATCH] schedule_index_upload: remove unused Option() around metadata
 param

---
 pageserver/src/storage_sync.rs    | 8 +++-----
 pageserver/src/tenant/timeline.rs | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pageserver/src/storage_sync.rs b/pageserver/src/storage_sync.rs
index 428c39cff3..66eada2ccd 100644
--- a/pageserver/src/storage_sync.rs
+++ b/pageserver/src/storage_sync.rs
@@ -398,7 +398,7 @@ impl RemoteTimelineClient {
     /// exist in remote storage, they really do.
     pub fn schedule_index_upload(
         self: &Arc<Self>,
-        metadata: Option<&TimelineMetadata>,
+        metadata: &TimelineMetadata,
     ) -> anyhow::Result<()> {
         let mut upload_queue = self.upload_queue.lock().unwrap();
         ensure!(
@@ -406,9 +406,7 @@ impl RemoteTimelineClient {
             "upload queue not initialized"
         );
 
-        if let Some(new_metadata) = metadata {
-            upload_queue.latest_metadata = Some(new_metadata.clone());
-        }
+        upload_queue.latest_metadata = Some(metadata.clone());
 
         let disk_consistent_lsn = upload_queue
             .latest_metadata
@@ -903,7 +901,7 @@ mod tests {
 
         // Schedule upload of index. Check that it is queued
         let metadata = dummy_metadata(Lsn(0x20));
-        client.schedule_index_upload(Some(&metadata))?;
+        client.schedule_index_upload(&metadata)?;
         {
             let upload_queue = client.upload_queue.lock().unwrap();
             assert!(upload_queue.queued_operations.len() == 1);
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index b9f88634b4..06df8f76ea 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1192,7 +1192,7 @@ impl Timeline {
         if !local_only_filenames.is_empty() {
             // FIXME this we should merge local and remote metadata, at least remote_consistent_lsn
             //    see comment in download_missing
-            remote_client.schedule_index_upload(Some(&up_to_date_metadata))?;
+            remote_client.schedule_index_upload(&up_to_date_metadata)?;
         }
 
         info!("Done");
@@ -1765,7 +1765,7 @@ impl Timeline {
             for (path, layer_metadata) in layer_paths_to_upload {
                 remote_client.schedule_layer_file_upload(&path, &layer_metadata)?;
             }
-            remote_client.schedule_index_upload(Some(&metadata))?;
+            remote_client.schedule_index_upload(&metadata)?;
         }
 
         Ok(())