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

don't hold timelines lock inside set_stopping()

Browse Source
This commit is contained in:
Christian Schwarz
2023-05-23 20:11:15 +02:00
parent 3e604eaa39
commit ee22e81583
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pageserver/src/tenant.rs
View File

@@ -1687,7 +1687,9 @@ impl Tenant {
Ok(())
}
/// Change tenant status to Stopping, to mark that it is being shut down
/// Change tenant status to Stopping, to mark that it is being shut down.
///
/// This function is not cancel-safe!
pub async fn set_stopping(&self) {
// Get the rx before checking state inside send_if_modified.
// This way, when we later rx.changed().await, we won't have missed
@@ -1698,24 +1700,20 @@ impl Tenant {
.await
.expect("we're a method on Tenant, so, we're keeping self.state alive here");
}
let mut stopping = false;
self.state.send_modify(|current_state| {
match current_state {
TenantState::Activating => unreachable!("we checked above and never transition back into Activating state"),
// FIXME: If the tenant is still Loading or Attaching, new timelines
// might be created after this. That's harmless, as the Timelines
// won't be accessible to anyone, when the Tenant is in Stopping
// state.
TenantState::Active | TenantState::Loading | TenantState::Attaching => {
*current_state = TenantState::Stopping;
// FIXME: If the tenant is still Loading or Attaching, new timelines
// might be created after this. That's harmless, as the Timelines
// won't be accessible to anyone, when the Tenant is in Stopping
// state.
let timelines_accessor = self.timelines.lock().unwrap();
let not_broken_timelines = timelines_accessor
.values()
.filter(|timeline| timeline.current_state() != TimelineState::Broken);
for timeline in not_broken_timelines {
timeline.set_state(TimelineState::Stopping);
}
}
stopping = true;
// Continue outside the closure. We need to grab timelines.lock()
// and we plan to turn it into a tokio::sync::Mutex in a future patch.
}
TenantState::Broken { reason, .. } => {
info!("Cannot set tenant to Stopping state, it is in Broken state due to: {reason}");
}
@@ -1725,7 +1723,17 @@ impl Tenant {
info!("Tenant is already in Stopping state");
}
}
})
});
if stopping {
let timelines_accessor = self.timelines.lock().unwrap();
let not_broken_timelines = timelines_accessor
.values()
.filter(|timeline| timeline.current_state() != TimelineState::Broken);
for timeline in not_broken_timelines {
timeline.set_state(TimelineState::Stopping);
}
}
}
pub async fn set_broken(&self, reason: String) {