From d9ba3c5f5ef3af4f16e8ffe23096310238b2d8c7 Mon Sep 17 00:00:00 2001 From: Anastasia Lubennikova Date: Thu, 16 Feb 2023 16:29:08 +0200 Subject: [PATCH] Revert "Add debug messages around timeline.get_current_logical_size" This reverts commit a5ce2b5330233927169152253548f822cf6d1643. --- pageserver/src/consumption_metrics.rs | 23 ++++++++++------------- pageserver/src/tenant/timeline.rs | 7 +------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/pageserver/src/consumption_metrics.rs b/pageserver/src/consumption_metrics.rs index a6d1ec3632..3d2a01effb 100644 --- a/pageserver/src/consumption_metrics.rs +++ b/pageserver/src/consumption_metrics.rs @@ -166,20 +166,17 @@ pub async fn collect_metrics_iteration( match timeline.get_current_logical_size(ctx) { // Only send timeline logical size when it is fully calculated. - Ok((size, is_exact)) => { - if is_exact { - current_metrics.push(( - PageserverConsumptionMetricsKey { - tenant_id, - timeline_id: Some(timeline.timeline_id), - metric: TIMELINE_LOGICAL_SIZE, - }, - size, - )); - } else { - info!("logical_size is not fully calculated for timeline {}, skipping sending value {} ", timeline.timeline_id, size); - } + Ok((size, is_exact)) if is_exact => { + current_metrics.push(( + PageserverConsumptionMetricsKey { + tenant_id, + timeline_id: Some(timeline.timeline_id), + metric: TIMELINE_LOGICAL_SIZE, + }, + size, + )); } + Ok((_, _)) => {} Err(err) => { error!( "failed to get current logical size for timeline {}: {err:?}", diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index e606cacf92..66afe2cdce 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -812,15 +812,10 @@ impl Timeline { let mut is_exact = true; let size = current_size.size(); - if let (CurrentLogicalSize::Approximate(approx_size), Some(init_lsn)) = + if let (CurrentLogicalSize::Approximate(_), Some(init_lsn)) = (current_size, self.current_logical_size.initial_part_end) { is_exact = false; - info!( - "Current size for timeline {} is approximate {}, initial_part_end lsn: {:?}", - self.timeline_id, approx_size, init_lsn - ); - self.try_spawn_size_init_task(init_lsn, ctx); }