From 5e45dd3f86b807f2e7a5b4278d738cf8336bddce Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Fri, 19 Jul 2024 15:20:59 +0000 Subject: [PATCH] rename SharedState::notify to continue_existing_attempt --- pageserver/src/tenant.rs | 4 +++- pageserver/src/tenant/timeline/detach_ancestor.rs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pageserver/src/tenant.rs b/pageserver/src/tenant.rs index a24d718f16..1812973084 100644 --- a/pageserver/src/tenant.rs +++ b/pageserver/src/tenant.rs @@ -710,7 +710,9 @@ impl Tenant { )); if let Some(attempt) = existing_detach_attempt { - tenant.ongoing_timeline_detach.notify(attempt); + tenant + .ongoing_timeline_detach + .continue_existing_attempt(attempt); } // The attach task will carry a GateGuard, so that shutdown() reliably waits for it to drop out if diff --git a/pageserver/src/tenant/timeline/detach_ancestor.rs b/pageserver/src/tenant/timeline/detach_ancestor.rs index 231eac52d8..3dd9ee0606 100644 --- a/pageserver/src/tenant/timeline/detach_ancestor.rs +++ b/pageserver/src/tenant/timeline/detach_ancestor.rs @@ -136,7 +136,7 @@ impl Default for SharedState { impl SharedState { /// Notify an uninitialized shared state that an attempt to detach timeline ancestor continues /// from previous instance. - pub(crate) fn notify(&self, _attempt: &Attempt) {} + pub(crate) fn continue_existing_attempt(&self, attempt: &Attempt) {} /// Only GC must be paused while a detach ancestor is ongoing. Compaction can happen, to aid /// with any ongoing ingestion. Compaction even after restart is ok because layers will not be