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

fixup: missed hashset change

Browse Source
This commit is contained in:
Joonas Koivunen
2024-07-25 09:24:02 +00:00
parent c8880b69fb
commit 8885a8c482
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1237,12 +1237,16 @@ pub(super) async fn detach_and_reparent(
}
let reparenting_candidates = tasks.len();
let mut reparented = Vec::with_capacity(tasks.len());
let mut reparented = HashSet::with_capacity(tasks.len());
while let Some(res) = tasks.join_next().await {
match res {
Ok(Some(timeline)) => {
reparented.push((timeline.ancestor_lsn, timeline.timeline_id));
assert!(
reparented.insert(timeline.timeline_id),
"duplicate reparenting? timeline_id={}",
timeline.timeline_id
);
}
Ok(None) => {
// lets just ignore this for now. one or all reparented timelines could had
@@ -1267,14 +1271,6 @@ pub(super) async fn detach_and_reparent(
candidates = reparenting_candidates,
"failed to reparent all candidates; they can be retried after the restart",
);
reparented.sort_unstable();
let reparented = reparented
.into_iter()
.map(|(_, timeline_id)| timeline_id)
.collect();
Ok(DetachingAndReparenting::Reparented(reparented))
} else {
let must_restart = !reparented.is_empty() || was_detached;