From c6d383e239167c90196d9b9a3640102622f0d50f Mon Sep 17 00:00:00 2001 From: Anastasia Lubennikova Date: Thu, 12 Jan 2023 20:28:23 +0200 Subject: [PATCH] code cleanup --- pageserver/src/consumption_metrics.rs | 11 +++-------- pageserver/src/tenant/size.rs | 3 ++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pageserver/src/consumption_metrics.rs b/pageserver/src/consumption_metrics.rs index d1e54938ca..423cb6c1d6 100644 --- a/pageserver/src/consumption_metrics.rs +++ b/pageserver/src/consumption_metrics.rs @@ -379,15 +379,10 @@ pub async fn calculate_synthetic_size_worker( continue; } - match mgr::get_tenant(tenant_id, true).await + if let Ok(tenant) = mgr::get_tenant(tenant_id, true).await { - Ok(tenant) => { - if let Err(e) = tenant.calculate_synthetic_size().await { - error!("failed to calculate synthetic size for tenant {}: {}", tenant_id, e); - } - }, - Err(err) => { - error!("tenant {} is not found: {err:?}", tenant_id); + if let Err(e) = tenant.calculate_synthetic_size().await { + error!("failed to calculate synthetic size for tenant {}: {}", tenant_id, e); } } diff --git a/pageserver/src/tenant/size.rs b/pageserver/src/tenant/size.rs index 8486615214..dd4bf768a7 100644 --- a/pageserver/src/tenant/size.rs +++ b/pageserver/src/tenant/size.rs @@ -52,7 +52,6 @@ struct TimelineInputs { // need to sort them in the tree order. // // see updates_sort_with_branches_at_same_lsn test below - fn sort_updates_in_tree_order(updates: Vec) -> anyhow::Result> { let mut sorted_updates = Vec::with_capacity(updates.len()); let mut known_timelineids = HashSet::new(); @@ -380,6 +379,8 @@ pub(super) async fn gather_inputs( // handled by the variant order in `Command`. // updates.sort_unstable(); + // And another sort to handle Command::BranchFrom ordering + // in case when there are multiple branches at the same LSN. let sorted_updates = sort_updates_in_tree_order(updates)?; let retention_period = match max_cutoff_distance {