rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 17:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: cleanup extra cancellation waits

Browse Source
This commit is contained in:
Joonas Koivunen
2023-12-13 22:36:28 +00:00
parent d6f6e9a87b
commit 960a29a6fe
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1795,9 +1795,6 @@ impl Timeline {
permit = wait_for_permit => {
(Some(permit), StartCircumstances::AfterBackgroundTasksRateLimit)
}
_ = self_ref.cancel.cancelled() => {
return Err(BackgroundCalculationError::Cancelled);
}
_ = cancel.cancelled() => {
return Err(BackgroundCalculationError::Cancelled);
},

2
pageserver/src/tenant/timeline/eviction_task.rs
View File

@@ -72,7 +72,6 @@ impl Timeline {
let cancel = task_mgr::shutdown_token();
tokio::select! {
_ = cancel.cancelled() => { return Ok(()); }
_ = self_clone.cancel.cancelled() => { return Ok(()); }
_ = completion::Barrier::maybe_wait(background_tasks_can_start) => {}
};
@@ -168,7 +167,6 @@ impl Timeline {
let _permit = tokio::select! {
permit = acquire_permit => permit,
_ = cancel.cancelled() => return ControlFlow::Break(()),
_ = self.cancel.cancelled() => return ControlFlow::Break(()),
};
// If we evict layers but keep cached values derived from those layers, then