diff --git a/pageserver/src/deletion_queue.rs b/pageserver/src/deletion_queue.rs index 5f49571ced..9dadd264cf 100644 --- a/pageserver/src/deletion_queue.rs +++ b/pageserver/src/deletion_queue.rs @@ -184,7 +184,7 @@ impl DeletionQueueClient { tenant_id, timeline_id, layers: Vec::new(), - objects: objects, + objects, })) .await; } @@ -245,7 +245,7 @@ impl BackendQueueWorker { DELETION_QUEUE_ERRORS .with_label_values(&["failpoint"]) .inc(); - return false; + false }); if self.accumulator.is_empty() { @@ -478,7 +478,7 @@ impl FrontendQueueWorker { return; } - match self.remote_storage.upload(source, size, &key, None).await { + match self.remote_storage.upload(source, size, key, None).await { Ok(_) => { info!( "Stored deletion list {key} ({0}..{1})", diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index 5435535d02..cadb9f539e 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -1138,7 +1138,7 @@ async fn deletion_queue_flush_execute( ) -> Result, ApiError> { let state = get_state(&r); - if let None = state.remote_storage { + if state.remote_storage.is_none() { // Nothing to do if remote storage is disabled. return json_response(StatusCode::OK, ()); } diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs index 0e4428bd51..3c90ded107 100644 --- a/pageserver/src/tenant/timeline.rs +++ b/pageserver/src/tenant/timeline.rs @@ -1266,7 +1266,7 @@ impl Timeline { async fn delete_all_remote(&self) -> anyhow::Result<()> { if let Some(remote_client) = &self.remote_client { if let Some(deletion_queue_client) = &self.deletion_queue_client { - remote_client.delete_all(&deletion_queue_client).await + remote_client.delete_all(deletion_queue_client).await } else { Ok(()) }