From cd277a142092004410fbf044f3af8de9e18b6250 Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Fri, 8 Dec 2023 15:58:17 +0000 Subject: [PATCH] fmt --- proxy/src/auth/backend.rs | 16 +++++++++++++--- proxy/src/console/provider.rs | 4 +++- proxy/src/console/provider/mock.rs | 2 +- proxy/src/proxy.rs | 8 ++++++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/proxy/src/auth/backend.rs b/proxy/src/auth/backend.rs index 99e1a28cbc..9dfe0d8078 100644 --- a/proxy/src/auth/backend.rs +++ b/proxy/src/auth/backend.rs @@ -255,7 +255,9 @@ async fn auth_and_wake_compute( let mut num_retries = 0; let mut node = loop { - let wake_res = api.wake_compute(extra, &compute_credentials.info, latency_timer).await; + let wake_res = api + .wake_compute(extra, &compute_credentials.info, latency_timer) + .await; match handle_try_wake(wake_res, num_retries) { Err(e) => { error!(error = ?e, num_retries, retriable = false, "couldn't wake compute node"); @@ -411,9 +413,17 @@ impl BackendType<'_, ComputeUserInfo> { use BackendType::*; match self { - Console(api, creds) => api.wake_compute(extra, creds, latency_timer).map_ok(Some).await, + Console(api, creds) => { + api.wake_compute(extra, creds, latency_timer) + .map_ok(Some) + .await + } #[cfg(feature = "testing")] - Postgres(api, creds) => api.wake_compute(extra, creds, latency_timer).map_ok(Some).await, + Postgres(api, creds) => { + api.wake_compute(extra, creds, latency_timer) + .map_ok(Some) + .await + } Link(_) => Ok(None), #[cfg(test)] Test(x) => x.wake_compute().map(Some), diff --git a/proxy/src/console/provider.rs b/proxy/src/console/provider.rs index 1f860f10e3..fc74d970ce 100644 --- a/proxy/src/console/provider.rs +++ b/proxy/src/console/provider.rs @@ -6,7 +6,9 @@ use super::messages::MetricsAuxInfo; use crate::{ auth::backend::ComputeUserInfo, cache::{timed_lru, TimedLru}, - compute, scram, proxy::LatencyTimer, + compute, + proxy::LatencyTimer, + scram, }; use async_trait::async_trait; use dashmap::DashMap; diff --git a/proxy/src/console/provider/mock.rs b/proxy/src/console/provider/mock.rs index 3b0691a2c9..6f0ec08194 100644 --- a/proxy/src/console/provider/mock.rs +++ b/proxy/src/console/provider/mock.rs @@ -6,8 +6,8 @@ use super::{ errors::{ApiError, GetAuthInfoError, WakeComputeError}, AuthInfo, AuthSecret, CachedNodeInfo, ConsoleReqExtra, NodeInfo, }; -use crate::{auth::backend::ComputeUserInfo, compute, error::io_error, scram, url::ApiUrl}; use crate::proxy::LatencyTimer; +use crate::{auth::backend::ComputeUserInfo, compute, error::io_error, scram, url::ApiUrl}; use async_trait::async_trait; use futures::TryFutureExt; use thiserror::Error; diff --git a/proxy/src/proxy.rs b/proxy/src/proxy.rs index 0f994b1f71..7e878d6e98 100644 --- a/proxy/src/proxy.rs +++ b/proxy/src/proxy.rs @@ -750,9 +750,13 @@ where info!("compute node's state has likely changed; requesting a wake-up"); let node_info = loop { let wake_res = match creds { - auth::BackendType::Console(api, creds) => api.wake_compute(extra, creds, &mut latency_timer).await, + auth::BackendType::Console(api, creds) => { + api.wake_compute(extra, creds, &mut latency_timer).await + } #[cfg(feature = "testing")] - auth::BackendType::Postgres(api, creds) => api.wake_compute(extra, creds, &mut latency_timer).await, + auth::BackendType::Postgres(api, creds) => { + api.wake_compute(extra, creds, &mut latency_timer).await + } // nothing to do? auth::BackendType::Link(_) => return Err(err.into()), // test backend