From f9185b42a95fcde5c182764ec476645fcdcbe8c3 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Wed, 17 Jul 2024 12:06:47 +0000 Subject: [PATCH] doc: minor enhancements --- pageserver/src/tenant/timeline/detach_ancestor.rs | 2 ++ storage_controller/src/service.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pageserver/src/tenant/timeline/detach_ancestor.rs b/pageserver/src/tenant/timeline/detach_ancestor.rs index ee5f8cd52a..f7c36085b4 100644 --- a/pageserver/src/tenant/timeline/detach_ancestor.rs +++ b/pageserver/src/tenant/timeline/detach_ancestor.rs @@ -150,6 +150,8 @@ pub(super) async fn prepare( .values() .filter(|tl| matches!(tl.ancestor_timeline.as_ref(), Some(ancestor) if Arc::ptr_eq(ancestor, detached))) .map(|tl| (tl.ancestor_lsn, tl.clone())) + // Collect to avoid lock taking order problem with Tenant::timelines and + // Timeline::remote_client .collect::>(); let mut any_shutdown = false; diff --git a/storage_controller/src/service.rs b/storage_controller/src/service.rs index e890c5e45e..e7cb0a28e0 100644 --- a/storage_controller/src/service.rs +++ b/storage_controller/src/service.rs @@ -2858,7 +2858,7 @@ impl Service { Error::ApiError(StatusCode::BAD_REQUEST, msg) => { ApiError::BadRequest(anyhow::anyhow!("{node}: {msg}")) } - // rest can be mapped + // rest can be mapped as usual other => passthrough_api_error(&node, other), } })