rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-24 00:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return reparented_direct_children in case we reparent nothing new

Browse Source
This commit is contained in:
Joonas Koivunen
2024-07-19 09:58:59 +00:00
parent 44cdb9fb58
commit 6a8f00dea0
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pageserver/src/tenant/timeline/detach_ancestor.rs
View File

@@ -1056,7 +1056,7 @@ pub(super) async fn complete(
.context("publish layers and detach ancestor")?;
}
let (mut reparented, reparented_all) =
let (reparented, reparented_all) =
if let Some((ancestor, ancestor_lsn)) = ancestor.as_branchpoint() {
assert!(detach_is_ongoing, "to reparent, gc must still be blocked");
let mut tasks = tokio::task::JoinSet::new();
@@ -1176,22 +1176,22 @@ pub(super) async fn complete(
candidates = reparenting_candidates,
"failed to reparent all candidates; they will be retried after the restart",
);
// TODO: two-state Ok(return_value)?
(Vec::new(), false)
} else {
reparented.sort_unstable();
let reparented = reparented
.into_iter()
.map(|(_, timeline_id)| timeline_id)
.collect();
(reparented, true)
}
(reparented, reparented_all)
} else {
// FIXME: again, get the list of (ancestor_lsn, reparented)
(Vec::new(), true)
(reparented_direct_children(detached, tenant)?, true)
};
reparented.sort_unstable();
let reparented = reparented
.into_iter()
.map(|(_, timeline_id)| timeline_id)
.collect();
// FIXME: here everything has gone peachy, the tenant will be restarted next.
// after restart and before returning the response, the gc blocking must be undone
Ok((reparented, reparented_all))
}