From 216ec91ef39ff610d2225a7b5c7e61ddf0a025da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arpad=20M=C3=BCller?= <arpad@neon.tech>
Date: Fri, 27 Jun 2025 19:45:59 +0200
Subject: [PATCH] Respect cancellation for child generation

---
 pageserver/src/context.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pageserver/src/context.rs b/pageserver/src/context.rs
index 19b84a8994..4d624c72c7 100644
--- a/pageserver/src/context.rs
+++ b/pageserver/src/context.rs
@@ -361,15 +361,22 @@ impl RequestContextBuilder {
         self
     }
 
+    pub(crate) fn cancel(mut self, cancel: CancellationToken) -> Self {
+        self.inner.cancel = cancel;
+        self
+    }
+
     pub fn root(self) -> RequestContext {
         self.inner
     }
 
-    pub fn attached_child(self) -> RequestContext {
+    pub fn attached_child(mut self) -> RequestContext {
+        self.inner.cancel = self.inner.cancel.child_token();
         self.inner
     }
 
-    pub fn detached_child(self) -> RequestContext {
+    pub fn detached_child(mut self) -> RequestContext {
+        self.inner.cancel = CancellationToken::new();
         self.inner
     }
 }
@@ -389,6 +396,7 @@ impl RequestContext {
             scope: self.scope.clone(),
             perf_span: self.perf_span.clone(),
             perf_span_dispatch: self.perf_span_dispatch.clone(),
+            cancel: self.cancel.clone(),
         }
     }
 
@@ -431,6 +439,7 @@ impl RequestContext {
         RequestContextBuilder::from(self)
             .task_kind(task_kind)
             .download_behavior(download_behavior)
+            .cancel(CancellationToken::new())
             .detached_child()
     }