From a374d6b9e307a8884a4163ba63d0027f36e1b699 Mon Sep 17 00:00:00 2001 From: Anna Khanova Date: Tue, 5 Mar 2024 15:12:57 +0100 Subject: [PATCH 1/2] Fix project config. --- proxy/src/console/messages.rs | 3 ++- proxy/src/console/provider/neon.rs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/src/console/messages.rs b/proxy/src/console/messages.rs index 85adb316545f..102076f2c61c 100644 --- a/proxy/src/console/messages.rs +++ b/proxy/src/console/messages.rs @@ -101,9 +101,10 @@ pub struct MetricsAuxInfo { pub cold_start_info: Option, } -#[derive(Debug, Serialize, Deserialize, Clone)] +#[derive(Debug, Default, Serialize, Deserialize, Clone)] #[serde(rename_all = "snake_case")] pub enum ColdStartInfo { + #[default] Unknown = 0, Warm = 1, PoolHit = 2, diff --git a/proxy/src/console/provider/neon.rs b/proxy/src/console/provider/neon.rs index 71b34cb676ab..f3befa33e018 100644 --- a/proxy/src/console/provider/neon.rs +++ b/proxy/src/console/provider/neon.rs @@ -259,6 +259,9 @@ impl super::Api for Api { } let node = self.do_wake_compute(ctx, user_info).await?; + ctx.set_project(node.aux.clone()); + let cold_start_info = node.aux.cold_start_info.clone().unwrap_or_default(); + info!(?cold_start_info, "woken up a compute node"); let (_, cached) = self.caches.node_info.insert(key.clone(), node); info!(key = &*key, "created a cache entry for compute node info"); From 7c195e82fb487f90844fa21a7450c26f78f28cd0 Mon Sep 17 00:00:00 2001 From: Anna Khanova Date: Tue, 5 Mar 2024 15:14:30 +0100 Subject: [PATCH 2/2] Link flow as well --- proxy/src/auth/backend/link.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proxy/src/auth/backend/link.rs b/proxy/src/auth/backend/link.rs index ec7d89124727..7db76f3d9e53 100644 --- a/proxy/src/auth/backend/link.rs +++ b/proxy/src/auth/backend/link.rs @@ -102,6 +102,8 @@ pub(super) async fn authenticate( ctx.set_user(db_info.user.into()); ctx.set_project(db_info.aux.clone()); + let cold_start_info = db_info.aux.cold_start_info.clone().unwrap_or_default(); + info!(?cold_start_info, "woken up a compute node"); // Backwards compatibility. pg_sni_proxy uses "--" in domain names // while direct connections do not. Once we migrate to pg_sni_proxy