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

convert more 'no-op if Creating' into check_at_caller+asserts

Browse Source
This commit is contained in:
Christian Schwarz
2023-06-16 17:31:18 +02:00
parent e839c97188
commit 9ce6e7c86b
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pageserver/src/tenant.rs
View File

@@ -1757,6 +1757,11 @@ impl Tenant {
// execute on each timeline on the JoinSet, join after.
let per_timeline = |timeline: Arc<Timeline>| {
async move {
if let TimelineState::Creating = timeline.current_state() {
debug!("timeline is Creating, no need to flush it");
// TODO cancel creation? Or is that done by higher level shutdown code?
return;
}
match timeline.freeze_and_flush().await {
Ok(()) => {}
Err(err) => {
@@ -2284,10 +2289,10 @@ impl Tenant {
}
let timelines_accessor = self.timelines.lock().unwrap();
let not_broken_timelines = timelines_accessor
.values()
.filter(|timeline| !timeline.is_broken());
for timeline in not_broken_timelines {
let timelines_to_stop = timelines_accessor.values().filter(|timeline| {
!timeline.is_broken() && !matches!(timeline.current_state(), TimelineState::Creating)
});
for timeline in timelines_to_stop {
timeline.set_state(TimelineState::Stopping);
}
Ok(())

17
pageserver/src/tenant/timeline.rs
View File

@@ -691,12 +691,9 @@ impl Timeline {
#[instrument(skip(self), fields(tenant_id=%self.tenant_id, timeline_id=%self.timeline_id))]
pub async fn freeze_and_flush(&self) -> anyhow::Result<()> {
if self.current_state() == TimelineState::Creating {
debug!("timelines in Creating state are never written to");
assert!(
self.layers.read().await.open_layer.is_none(),
"would have nothing to flush anyways"
);
return Ok(());
// make a few additional sanity checks before panicking
assert!(self.layers.read().await.open_layer.is_none());
panic!("caller must prevent calls for timelines in Creating state")
}
self.freeze_inmem_layer(false).await;
self.flush_frozen_layers_and_wait().await
@@ -704,10 +701,10 @@ impl Timeline {
/// Outermost timeline compaction operation; downloads needed layers.
pub async fn compact(self: &Arc<Self>, ctx: &RequestContext) -> anyhow::Result<()> {
if self.current_state() == TimelineState::Creating {
debug!("timelines is in Creating state");
return Ok(());
}
assert!(
!matches!(self.current_state(), TimelineState::Creating),
"caller must prevent calls for timelines in Creating state"
);
const ROUNDS: usize = 2;