diff --git a/pageserver/src/disk_usage_eviction_task.rs b/pageserver/src/disk_usage_eviction_task.rs index c3538266d8..92e90a835d 100644 --- a/pageserver/src/disk_usage_eviction_task.rs +++ b/pageserver/src/disk_usage_eviction_task.rs @@ -113,7 +113,7 @@ pub fn launch_disk_usage_global_eviction_task( _ = background_jobs_barrier.wait() => { } }; - disk_usage_eviction_task(&state, task_config, storage, &conf.tenants_path(), cancel) + disk_usage_eviction_task(&state, task_config, &storage, &conf.tenants_path(), cancel) .await; Ok(()) }, @@ -126,7 +126,7 @@ pub fn launch_disk_usage_global_eviction_task( async fn disk_usage_eviction_task( state: &State, task_config: &DiskUsageEvictionTaskConfig, - storage: GenericRemoteStorage, + _storage: &GenericRemoteStorage, tenants_dir: &Path, cancel: CancellationToken, ) { @@ -150,14 +150,8 @@ async fn disk_usage_eviction_task( let start = Instant::now(); async { - let res = disk_usage_eviction_task_iteration( - state, - task_config, - &storage, - tenants_dir, - &cancel, - ) - .await; + let res = + disk_usage_eviction_task_iteration(state, task_config, tenants_dir, &cancel).await; match res { Ok(()) => {} @@ -188,13 +182,12 @@ pub trait Usage: Clone + Copy + std::fmt::Debug { async fn disk_usage_eviction_task_iteration( state: &State, task_config: &DiskUsageEvictionTaskConfig, - storage: &GenericRemoteStorage, tenants_dir: &Path, cancel: &CancellationToken, ) -> anyhow::Result<()> { let usage_pre = filesystem_level_usage::get(tenants_dir, task_config) .context("get filesystem-level disk usage before evictions")?; - let res = disk_usage_eviction_task_iteration_impl(state, storage, usage_pre, cancel).await; + let res = disk_usage_eviction_task_iteration_impl(state, usage_pre, cancel).await; match res { Ok(outcome) => { debug!(?outcome, "disk_usage_eviction_iteration finished"); @@ -278,7 +271,6 @@ struct LayerCount { pub async fn disk_usage_eviction_task_iteration_impl( state: &State, - storage: &GenericRemoteStorage, usage_pre: U, cancel: &CancellationToken, ) -> anyhow::Result> {