From ba3a6645e7dcb8ba307b1acdbba3798619d46408 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Thu, 25 Jul 2024 09:16:27 +0000 Subject: [PATCH] fix: info log line again, botched rebase? --- pageserver/src/tenant/timeline/detach_ancestor.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pageserver/src/tenant/timeline/detach_ancestor.rs b/pageserver/src/tenant/timeline/detach_ancestor.rs index 46d78e6909..2ad9a5c740 100644 --- a/pageserver/src/tenant/timeline/detach_ancestor.rs +++ b/pageserver/src/tenant/timeline/detach_ancestor.rs @@ -1266,13 +1266,14 @@ pub(super) async fn detach_and_reparent( let reparented_all = reparenting_candidates == reparented.len(); if reparented_all { + Ok(DetachingAndReparenting::Reparented(reparented)) + } else { tracing::info!( reparented = reparented.len(), candidates = reparenting_candidates, "failed to reparent all candidates; they can be retried after the restart", ); - Ok(DetachingAndReparenting::Reparented(reparented)) - } else { + let must_restart = !reparented.is_empty() || was_detached; Ok(DetachingAndReparenting::SomeReparentingFailed { must_restart })