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

fix: use new LayerE::for_resident

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-24 11:57:09 +03:00
parent b1134f6857
commit bc5a643c19
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1516,21 +1516,26 @@ impl Timeline {
let stats = LayerAccessStats::for_loading_layer(status);
let layer = match (name, &decision) {
(name, UseLocal(m) | NeedsUpload(m)) => {
// FIXME: needsupload need to be ResidentLayers
let layer = match decision {
NeedsUpload(m) => {
total_physical_size += m.file_size();
Arc::new(LayerE::new(conf, &this, &name, m.file_size(), stats))
let resident = LayerE::for_resident(conf, &this, name, &m);
let layer = resident.as_ref().clone();
needs_upload.push((resident, m));
layer
}
(name, Evicted(remote) | UseRemote { remote, .. }) => {
UseLocal(m) => {
total_physical_size += m.file_size();
let resident = LayerE::for_resident(conf, &this, name, &m);
resident.drop_eviction_guard()
}
Evicted(remote) | UseRemote { remote, .. } => {
// FIXME: there ought to be a known evicted factory instead of generic
// new
Arc::new(LayerE::new(conf, &this, &name, remote.file_size(), stats))
}
};
if let NeedsUpload(m) = decision {
needs_upload.push((layer.clone(), m));
}
loaded_layers.push(layer);
}
Ok((