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

refactor: combine nested macthes

Browse Source
This commit is contained in:
Joonas Koivunen
2023-03-28 11:28:52 +03:00
committed by Joonas Koivunen
parent 17b5c8d1c4
commit 6e8d7b449f
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pageserver/src/disk_usage_eviction_task.rs
View File

@@ -534,35 +534,32 @@ async fn extend_lru_candidates(
lru_candidates.append(scratch);
return ControlFlow::Continue(());
}
Mode::RespectTenantMinResidentSize => match tenant.get_min_resident_size_override() {
Some(size) => size,
None => {
match max_layer_size {
Some(size) => size,
None => {
if !scratch.is_empty() {
// soft assert
warn!("BUG: no maximum layer size, but still found layers");
scratch.clear();
}
return ControlFlow::Continue(());
// let prod_max_layer_file_size = 332_880_000;
// // rate-limit warning in case above comment is wrong and we're missing `LayerMetadata` for many layers
// static LAST_WARNED: Mutex<Option<Instant>> = Mutex::new(None);
// let mut last_warned = LAST_WARNED.lock().unwrap();
// if last_warned
// .map(|v| v.elapsed() > Duration::from_secs(60))
// .unwrap_or(true)
// {
// warn!(value=prod_max_layer_file_size, "some layers don't have LayerMetadata to calculate max_layer_file_size, using default value");
// *last_warned = Some(Instant::now());
// }
// prod_max_layer_file_size
Mode::RespectTenantMinResidentSize => {
match tenant.get_min_resident_size_override().or(max_layer_size) {
Some(size) => size,
None => {
if !scratch.is_empty() {
// soft assert
warn!("BUG: no maximum layer size, but still found layers");
scratch.clear();
}
return ControlFlow::Continue(());
// let prod_max_layer_file_size = 332_880_000;
// // rate-limit warning in case above comment is wrong and we're missing `LayerMetadata` for many layers
// static LAST_WARNED: Mutex<Option<Instant>> = Mutex::new(None);
// let mut last_warned = LAST_WARNED.lock().unwrap();
// if last_warned
// .map(|v| v.elapsed() > Duration::from_secs(60))
// .unwrap_or(true)
// {
// warn!(value=prod_max_layer_file_size, "some layers don't have LayerMetadata to calculate max_layer_file_size, using default value");
// *last_warned = Some(Instant::now());
// }
// prod_max_layer_file_size
}
}
},
}
};
scratch.sort_unstable_by_key(|(_, layer_info)| layer_info.last_activity_ts);