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

Fix releasing of timelines lock (#1100)

Browse Source 
refer #1087
This commit is contained in:
Konstantin Knizhnik
2022-01-12 15:05:08 +03:00
committed by GitHub
parent 7aba299dbd
commit f70a5cad61
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pageserver/src/layered_repository.rs
View File

@@ -622,7 +622,6 @@ impl LayeredRepository {
};
if let Some(ancestor_timeline) = &timeline.ancestor_timeline {
drop(timelines);
let ancestor_timeline =
match ancestor_timeline.local_or_schedule_download(self.tenantid) {
Some(timeline) => timeline,
@@ -646,7 +645,6 @@ impl LayeredRepository {
else {
all_branchpoints.insert((ancestor_timeline.timelineid, timeline.ancestor_lsn));
}
timelines = self.timelines.lock().unwrap();
}
}
@@ -675,6 +673,7 @@ impl LayeredRepository {
}
if let Some(cutoff) = timeline.get_last_record_lsn().checked_sub(horizon) {
drop(timelines);
let branchpoints: Vec<Lsn> = all_branchpoints
.range((
Included((timelineid, Lsn(0))),
@@ -694,6 +693,7 @@ impl LayeredRepository {
let result = timeline.gc_timeline(branchpoints, cutoff)?;
totals += result;
timelines = self.timelines.lock().unwrap();
}
}