From b9d0b26cea91e67b6f09826b50e9e593528f84a1 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Thu, 25 Jul 2024 09:15:59 +0000 Subject: [PATCH] doc: remove possibly wrong comment --- pageserver/src/tenant/timeline/detach_ancestor.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pageserver/src/tenant/timeline/detach_ancestor.rs b/pageserver/src/tenant/timeline/detach_ancestor.rs index 893ad7dbee..066daaf5f9 100644 --- a/pageserver/src/tenant/timeline/detach_ancestor.rs +++ b/pageserver/src/tenant/timeline/detach_ancestor.rs @@ -1251,17 +1251,10 @@ pub(super) async fn detach_and_reparent( timeline.timeline_id ); } - Ok(None) => { - // lets just ignore this for now. one or all reparented timelines could had - // started deletion, and that is fine. deleting a timeline is the most likely - // reason for this. - } Err(je) if je.is_cancelled() => unreachable!("not used"), - Err(je) if je.is_panic() => { - // ignore; it's better to continue with a single reparenting failing (or even - // all of them) in order to get to the goal state. we will retry this after - // restart. - } + // just ignore failures now, we can retry + Ok(None) => {} + Err(je) if je.is_panic() => {} Err(je) => tracing::error!("unexpected join error: {je:?}"), } }