From a501095c5a2908b285b8aaf9f402f8a10cea83c8 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Tue, 21 Jan 2025 23:22:31 +0100
Subject: [PATCH] fixup(commit b2dbc47b31f7fdd7b170daf3673e60a47a8043fd initial
 logical size calculation wasn't polled to completion; fix that, to make tests
 pass)

(requires previous commit)
---
 pageserver/src/tenant/timeline.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 4509ba6a8d..2dacd5a383 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -3051,7 +3051,10 @@ impl Timeline {
             self.timeline_id, up_to_lsn
         );
 
-        pausable_failpoint!("timeline-calculate-logical-size-pause");
+        if let Err(()) = pausable_failpoint!("timeline-calculate-logical-size-pause", &self.cancel)
+        {
+            return Err(CalculateLogicalSizeError::Cancelled);
+        }
 
         // See if we've already done the work for initial size calculation.
         // This is a short-cut for timelines that are mostly unused.