From 895ecef31857d6e1207e203724b1a9e13d1f0e23 Mon Sep 17 00:00:00 2001
From: John Spray <john@neon.tech>
Date: Wed, 26 Jun 2024 13:08:59 +0000
Subject: [PATCH] pageserver: suppress layer download warnings during shutdown

---
 pageserver/src/tenant/timeline.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 8dd0a23f46..8a7026691d 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -3336,7 +3336,13 @@ impl Timeline {
                     .await
                 {
                     Ok(result) => result,
-                    Err(e) => return Err(PageReconstructError::from(e)),
+                    Err(e) => {
+                        return Err(if self.cancel.is_cancelled() {
+                            PageReconstructError::Cancelled
+                        } else {
+                            PageReconstructError::Other(e)
+                        })
+                    }
                 };
                 cont_lsn = lsn_floor;
                 *read_count += 1;