From f82ba477a4c3f776613fefbdfd6ccc0767186ed2 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Mon, 21 Aug 2023 09:43:38 +0300 Subject: [PATCH] http: limit genericremotestorage exposure --- pageserver/src/http/routes.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index d2a7adc5fe..1ef797824b 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -1160,11 +1160,11 @@ async fn disk_usage_eviction_run( let state = get_state(&r); - let Some(storage) = state.remote_storage.clone() else { + if state.remote_storage.as_ref().is_none() { return Err(ApiError::InternalServerError(anyhow::anyhow!( "remote storage not configured, cannot run eviction iteration" ))); - }; + } let state = state.disk_usage_eviction_state.clone(); @@ -1182,7 +1182,6 @@ async fn disk_usage_eviction_run( async move { let res = crate::disk_usage_eviction_task::disk_usage_eviction_task_iteration_impl( &state, - &storage, usage, &child_cancel, )