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

relax overly strict comparisons

Browse Source
This commit is contained in:
Joonas Koivunen
2024-07-19 16:07:35 +00:00
parent 7f767ca18e
commit 89426570d3
1 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,6 +337,11 @@ impl SharedState {
g.cancel(attempt);
tracing::info!("keeping the gc blocking for retried detach_ancestor");
}
pub(crate) fn on_delete(&self, timeline: &Arc<Timeline>) {
let mut g = self.inner.lock().unwrap();
g.on_delete(&timeline.timeline_id);
}
}
#[derive(Default)]
@@ -386,43 +391,60 @@ impl SharedStateInner {
fn validate(&self, attempt: &Attempt) {
match self.latest.as_ref() {
Some((ExistingAttempt::ContinuedOverRestart(x), _)) if x == &attempt.timeline_id => {
assert!(self.known_ongoing.contains(&attempt.timeline_id));
}
other => unreachable!("unexpected: {other:?}"),
Some((ExistingAttempt::ContinuedOverRestart(x), _)) if x == &attempt.timeline_id => {}
Some((ExistingAttempt::Actual(x, barrier), _))
if x == &attempt.timeline_id && attempt._guard.blocks(barrier) => {}
other => unreachable!("unexpected: {other:?} for {attempt:?}"),
}
assert!(self.known_ongoing.contains(&attempt.timeline_id));
}
fn complete(&mut self, attempt: Attempt) {
match self.latest.as_ref() {
let witnessed = match self.latest.as_ref() {
Some((ExistingAttempt::ContinuedOverRestart(x), witnessed))
if x == &attempt.timeline_id =>
{
let witnessed = *witnessed;
assert!(self.known_ongoing.remove(&attempt.timeline_id));
if self.known_ongoing.is_empty() {
self.latest = None;
tracing::info!("gc is now unblocked");
} else {
self.latest = Some((ExistingAttempt::ReadFromIndexPart, witnessed));
}
*witnessed
}
Some((ExistingAttempt::Actual(x, barrier), witnessed))
if x == &attempt.timeline_id && attempt._guard.blocks(barrier) =>
{
*witnessed
}
other => unreachable!("unexpected: {other:?}"),
};
assert!(self.known_ongoing.remove(&attempt.timeline_id));
if self.known_ongoing.is_empty() {
self.latest = None;
tracing::info!("gc is now unblocked following completion");
} else {
self.latest = Some((ExistingAttempt::ReadFromIndexPart, witnessed));
tracing::info!(
n = self.known_ongoing.len(),
"gc is still blocked for remaining ongoing detaches"
);
}
}
fn cancel(&mut self, attempt: Attempt) {
match self.latest.as_ref() {
let witnessed = match self.latest.as_ref() {
Some((ExistingAttempt::ContinuedOverRestart(x), witnessed))
if x == &attempt.timeline_id =>
{
let witnessed = *witnessed;
assert!(!self.known_ongoing.is_empty());
self.latest = Some((ExistingAttempt::ReadFromIndexPart, witnessed));
*witnessed
}
Some((ExistingAttempt::Actual(x, barrier), witnessed))
if x == &attempt.timeline_id && attempt._guard.blocks(barrier) =>
{
*witnessed
}
other => unreachable!("unexpected: {other:?}"),
}
};
assert!(!self.known_ongoing.is_empty());
self.latest = Some((ExistingAttempt::ReadFromIndexPart, witnessed));
}
}
@@ -465,6 +487,7 @@ impl ExistingAttempt {
}
/// Represents an across tenant reset exclusive single attempt to detach ancestor.
#[derive(Debug)]
pub(crate) struct Attempt {
timeline_id: TimelineId,