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

wip: try out a fix

Browse Source
This commit is contained in:
Vlad Lazar
2025-06-25 14:26:34 +02:00
parent a4fdef69ad
commit 858f5f2ddc
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4707,7 +4707,15 @@ impl Timeline {
let (layer, l0_count, frozen_count, frozen_size) = {
let layers = self.layers.read(LayerManagerLockHolder::FlushLoop).await;
let Ok(lm) = layers.layer_map() else {
info!("dropping out of flush loop for timeline shutdown");
if self.cancel.is_cancelled() {
info!("dropping out of flush loop for timeline shutdown");
} else {
info!("dropping out of flush loop for layer map shutdown");
let _ = self
.layer_flush_done_tx
.send_replace((flush_counter, Err(FlushLayerError::Cancelled)));
}
return;
};
let l0_count = lm.level0_deltas().len();
@@ -4756,7 +4764,15 @@ impl Timeline {
match self.flush_frozen_layer(layer, ctx).await {
Ok(layer_lsn) => flushed_to_lsn = max(flushed_to_lsn, layer_lsn),
Err(FlushLayerError::Cancelled) => {
info!("dropping out of flush loop for timeline shutdown");
if self.cancel.is_cancelled() {
info!("dropping out of flush loop for timeline shutdown");
} else {
info!("dropping out of flush loop for remote client shutdown");
let _ = self
.layer_flush_done_tx
.send_replace((flush_counter, Err(FlushLayerError::Cancelled)));
}
return;
}
err @ Err(