From 5b30b9fe1187eba7423ad4e5d41e027d10c46a02 Mon Sep 17 00:00:00 2001
From: Vlad Lazar <vlalazar.vlad@gmail.com>
Date: Thu, 4 Apr 2024 16:38:34 +0100
Subject: [PATCH] sq

---
 .../tenant/storage_layer/inmemory_layer.rs    |  1 +
 .../src/tenant/timeline/layer_manager.rs      | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pageserver/src/tenant/storage_layer/inmemory_layer.rs b/pageserver/src/tenant/storage_layer/inmemory_layer.rs
index 8d37a12211..066a803c06 100644
--- a/pageserver/src/tenant/storage_layer/inmemory_layer.rs
+++ b/pageserver/src/tenant/storage_layer/inmemory_layer.rs
@@ -459,6 +459,7 @@ impl InMemoryLayer {
         Ok(InMemoryLayer {
             file_id: key,
             conf,
+            tenant_conf,
             timeline_id,
             tenant_shard_id,
             start_lsn,
diff --git a/pageserver/src/tenant/timeline/layer_manager.rs b/pageserver/src/tenant/timeline/layer_manager.rs
index da5dbbcb4d..3639e11754 100644
--- a/pageserver/src/tenant/timeline/layer_manager.rs
+++ b/pageserver/src/tenant/timeline/layer_manager.rs
@@ -12,10 +12,12 @@ use crate::{
     config::PageServerConf,
     metrics::TimelineMetrics,
     tenant::{
-        layer_map::{BatchedUpdates, LayerMap}, storage_layer::{
+        layer_map::{BatchedUpdates, LayerMap},
+        storage_layer::{
             AsLayerDesc, InMemoryLayer, Layer, PersistentLayerDesc, PersistentLayerKey,
             ResidentLayer,
-        }, AttachedTenantConf
+        },
+        AttachedTenantConf,
     },
 };
 
@@ -23,7 +25,7 @@ use crate::{
 pub(crate) struct LayerManager {
     layer_map: LayerMap,
     layer_fmgr: LayerFileManager<Layer>,
-    tenant_conf: Arc<ArcSwap<AttachedTenantConf>>
+    tenant_conf: Arc<ArcSwap<AttachedTenantConf>>,
 }
 
 impl LayerManager {
@@ -31,7 +33,7 @@ impl LayerManager {
         Self {
             layer_map: LayerMap::default(),
             layer_fmgr: LayerFileManager::default(),
-            tenant_conf
+            tenant_conf,
         }
     }
 
@@ -112,8 +114,14 @@ impl LayerManager {
                 lsn
             );
 
-            let new_layer =
-                InMemoryLayer::create(conf, Arc::clone(&self.tenant_conf), timeline_id, tenant_shard_id, start_lsn).await?;
+            let new_layer = InMemoryLayer::create(
+                conf,
+                Arc::clone(&self.tenant_conf),
+                timeline_id,
+                tenant_shard_id,
+                start_lsn,
+            )
+            .await?;
             let layer = Arc::new(new_layer);
 
             self.layer_map.open_layer = Some(layer.clone());