Resolve merge conflicts

libs/pageserver_api/src/config.rs

@@ -537,7 +537,6 @@ pub mod defaults {
 
     pub const DEFAULT_SSL_KEY_FILE: &str = "server.key";
     pub const DEFAULT_SSL_CERT_FILE: &str = "server.crt";
-    pub const DEFAULT_LAZY_SLRU_DOWNLOAD_THRESHOLD: usize = 128;
 }
 
 impl Default for ConfigToml {

pageserver/src/config.rs

@@ -210,7 +210,6 @@ pub struct PageServerConf {
     /// Interpreted protocol feature: if enabled, validate that the logical WAL received from
     /// safekeepers does not have gaps.
     pub validate_wal_contiguity: bool,
-<<<<<<< HEAD
 
     /// When set, the previously written to disk heatmap is loaded on tenant attach and used
     /// to avoid clobbering the heatmap from new, cold, attached locations.
@@ -225,12 +224,6 @@ pub struct PageServerConf {
     /// Does not force TLS: the client negotiates TLS usage during the handshake.
     /// Uses key and certificate from ssl_key_file/ssl_cert_file.
     pub enable_tls_page_service_api: bool,
-    ///
-    /// Size of SLRU object in blocks which triggers on-demand download rarther than including it in basebackup
-    ///
-    pub lazy_slru_download_threshold: usize,
-=======
->>>>>>> 1ef4316b4 (Use lazy SLRU download for all timelines is feature flag is set)
 }
 
 /// Token for authentication to safekeepers
@@ -400,14 +393,10 @@ impl PageServerConf {
             get_vectored_concurrent_io,
             enable_read_path_debugging,
             validate_wal_contiguity,
-<<<<<<< HEAD
             load_previous_heatmap,
             generate_unarchival_heatmap,
             tracing,
             enable_tls_page_service_api,
-            lazy_slru_download_threshold,
-=======
->>>>>>> 1ef4316b4 (Use lazy SLRU download for all timelines is feature flag is set)
         } = config_toml;
 
         let mut conf = PageServerConf {

pageserver/src/page_service.rs

@@ -2486,7 +2486,7 @@ impl PageServerHandler {
                     prev_lsn,
                     full_backup,
                     replica,
-					lazy_slru_download,
+                    lazy_slru_download,
                     &ctx,
                 )
                 .await

pageserver/src/tenant/timeline.rs

@@ -2520,10 +2520,6 @@ impl Timeline {
             }
             None => false,
         }
-
-    pub(crate) fn set_lazy_slru_download(&self, enabled: bool) {
-        self.lazy_slru_download
-            .store(enabled, AtomicOrdering::Relaxed);
     }
 
     fn get_checkpoint_distance(&self) -> u64 {