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

Do not hold timelines lock while calling update_gc_info to avoid recusrive mutex lock and so deadlock (#2163)

Browse Source
This commit is contained in:
Konstantin Knizhnik
2022-07-26 22:21:05 +03:00
committed by GitHub
parent d301b8364c
commit 5a4394a8df
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/layered_repository.rs
View File

@@ -752,7 +752,7 @@ impl LayeredRepository {
// grab mutex to prevent new timelines from being created here.
let gc_cs = self.gc_cs.lock().unwrap();
let mut timelines = self.timelines.lock().unwrap();
let timelines = self.timelines.lock().unwrap();
// Scan all timelines. For each timeline, remember the timeline ID and
// the branch point where it was created.
@@ -789,15 +789,14 @@ impl LayeredRepository {
})
.collect::<Vec<_>>()
};
drop(timelines);
// Ok, we now know all the branch points.
// Update the GC information for each timeline.
let mut gc_timelines = Vec::with_capacity(timeline_ids.len());
for timeline_id in timeline_ids {
// Timeline is known to be local and loaded.
let timeline = self
.get_timeline_load_internal(timeline_id, &mut *timelines)?
.expect("checked above that timeline is local and loaded");
let timeline = self.get_timeline_load(timeline_id)?;
// If target_timeline is specified, ignore all other timelines
if let Some(target_timelineid) = target_timeline_id {
@@ -819,7 +818,6 @@ impl LayeredRepository {
gc_timelines.push(timeline);
}
}
drop(timelines);
drop(gc_cs);
// Perform GC for each timeline.