From d930a581f890e425887d38c848f7cffc80d3f694 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Fri, 18 Aug 2023 20:43:29 +0300 Subject: [PATCH] layer_manager: compaction changes --- pageserver/src/tenant/timeline/layer_manager.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pageserver/src/tenant/timeline/layer_manager.rs b/pageserver/src/tenant/timeline/layer_manager.rs index c0b311733c..63cba5e7f3 100644 --- a/pageserver/src/tenant/timeline/layer_manager.rs +++ b/pageserver/src/tenant/timeline/layer_manager.rs @@ -200,13 +200,18 @@ impl LayerManager { pub(crate) fn finish_compact_l0( &mut self, layer_removal_cs: &Arc>, - compact_from: Vec>, - compact_to: Vec>, + compact_from: Vec>, + compact_to: &[ResidentLayer], metrics: &TimelineMetrics, ) -> Result<()> { let mut updates = self.layer_map.batch_update(); for l in compact_to { - Self::insert_historic_layer(l, &mut updates, &mut self.layer_fmgr); + l.access_stats().record_residence_event( + &guard, + LayerResidenceStatus::Resident, + LayerResidenceEventReason::LayerCreate, + ); + Self::insert_historic_layer(l.as_ref().clone(), &mut updates, &mut self.layer_fmgr); } for l in compact_from { // NB: the layer file identified by descriptor `l` is guaranteed to be present