From a394f49e0dba004884dd1f7c7bc7e5888a3e5fb8 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 7 Nov 2023 09:35:45 +0000 Subject: [PATCH] pageserver: avoid converting an error to anyhow::Error (#5803) This was preventing it getting cleanly converted to a CalculateLogicalSizeError::Cancelled, resulting in "Logical size calculation failed" errors in logs. --- pageserver/src/pgdatadir_mapping.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pageserver/src/pgdatadir_mapping.rs b/pageserver/src/pgdatadir_mapping.rs index 88974588d4..aa4d155bcc 100644 --- a/pageserver/src/pgdatadir_mapping.rs +++ b/pageserver/src/pgdatadir_mapping.rs @@ -589,11 +589,7 @@ impl Timeline { let mut total_size: u64 = 0; for (spcnode, dbnode) in dbdir.dbdirs.keys() { - for rel in self - .list_rels(*spcnode, *dbnode, lsn, ctx) - .await - .context("list rels")? - { + for rel in self.list_rels(*spcnode, *dbnode, lsn, ctx).await? { if cancel.is_cancelled() { return Err(CalculateLogicalSizeError::Cancelled); }