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

move Layer and all to storage_layer::layer

Browse Source
This commit is contained in:
Joonas Koivunen
2023-08-24 20:35:37 +03:00
parent d8cb81118a
commit 41d36b65e2
5 changed files with 1145 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pageserver/src/disk_usage_eviction_task.rs
View File

@@ -62,8 +62,7 @@ use crate::{
task_mgr::{self, TaskKind, BACKGROUND_RUNTIME},
tenant::{
self,
storage_layer::{AsLayerDesc, Layer},
timeline::EvictionError,
storage_layer::{AsLayerDesc, EvictionError, Layer},
Timeline,
},
};

2
pageserver/src/tenant/remote_timeline_client.rs
View File

@@ -231,7 +231,7 @@ use crate::metrics::{
};
use crate::task_mgr::shutdown_token;
use crate::tenant::debug_assert_current_span_has_tenant_and_timeline_id;
use crate::tenant::remote_timeline_client::index::LayerFileMetadata;
pub(crate) use crate::tenant::remote_timeline_client::index::LayerFileMetadata;
use crate::tenant::storage_layer::AsLayerDesc;
use crate::tenant::upload_queue::Delete;
use crate::{

1125
pageserver/src/tenant/storage_layer.rs
View File

File diff suppressed because it is too large Load Diff

1136
pageserver/src/tenant/storage_layer/layer.rs Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -36,8 +36,9 @@ use crate::context::{
use crate::tenant::remote_timeline_client::index::LayerFileMetadata;
use crate::tenant::storage_layer::delta_layer::DeltaEntry;
use crate::tenant::storage_layer::{
AsLayerDesc, DeltaLayerWriter, ImageLayerWriter, InMemoryLayer, Layer, LayerAccessStatsReset,
LayerFileName, ResidentLayer, ValueReconstructResult, ValueReconstructState,
AsLayerDesc, DeltaLayerWriter, EvictionError, ImageLayerWriter, InMemoryLayer, Layer,
LayerAccessStatsReset, LayerFileName, ResidentLayer, ValueReconstructResult,
ValueReconstructState,
};
use crate::tenant::timeline::logical_size::CurrentLogicalSize;
use crate::tenant::{
@@ -1088,16 +1089,6 @@ impl Timeline {
}
}
#[derive(Debug, thiserror::Error)]
pub(crate) enum EvictionError {
#[error("layer was already evicted")]
NotFound,
/// Evictions must always lose to downloads in races, and this time it happened.
#[error("layer was downloaded instead")]
Downloaded,
}
/// Number of times we will compute partition within a checkpoint distance.
const REPARTITION_FREQ_IN_CHECKPOINT_DISTANCE: u64 = 10;