From 93e38fd602d4e959cd8f5edd862cd6015556222e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 3 Feb 2025 19:11:19 +0100
Subject: [PATCH] fix: timeout on list_user_usage after 300s

---
 backend/windmill-api/src/users.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
index b603259664..c0159480e7 100644
--- a/backend/windmill-api/src/users.rs
+++ b/backend/windmill-api/src/users.rs
@@ -10,6 +10,7 @@
 
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
+use std::time::Duration;
 
 use crate::db::ApiAuthed;
 
@@ -464,9 +465,11 @@ async fn list_user_usage(
         require_admin(authed.is_admin, &authed.username)?;
     }
     let mut tx = user_db.begin(&authed).await?;
-    let rows = sqlx::query_as!(
-        UserWithUsage,
-        "
+    let rows = tokio::time::timeout(
+        Duration::from_secs(300),
+        sqlx::query_as!(
+            UserWithUsage,
+            "
     SELECT usr.email, usage.executions
         FROM usr
             , LATERAL (
@@ -479,10 +482,12 @@ async fn list_user_usage(
             ) usage
         WHERE workspace_id = $1
         ",
-        w_id
+            w_id
+        )
+        .fetch_all(&mut *tx),
     )
-    .fetch_all(&mut *tx)
-    .await?;
+    .await
+    .map_err(|e| Error::InternalErr(format!("Timed out while fetching user usage: {e:#}")))??;
     tx.commit().await?;
     Ok(Json(rows))
 }