From 86ca005c546382407a47adbf431af0f7657ae48b Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 25 Feb 2024 20:37:33 +0100
Subject: [PATCH] fix: do not handle zombie jobs on initial_load of monitor db

---
 backend/src/main.rs    | 3 ++-
 backend/src/monitor.rs | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/src/main.rs b/backend/src/main.rs
index dd3ae1202b..a693b7269c 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -300,7 +300,7 @@ Windmill Community Edition {GIT_VERSION}
 
         initial_load(&db, killpill_tx.clone(), worker_mode, server_mode).await;
 
-        monitor_db(&db, &base_internal_url, rsmq.clone(), server_mode).await;
+        monitor_db(&db, &base_internal_url, rsmq.clone(), server_mode, true).await;
 
         monitor_pool(&db).await;
 
@@ -377,6 +377,7 @@ Windmill Community Edition {GIT_VERSION}
                                 &base_internal_url,
                                 rsmq.clone(),
                                 server_mode,
+                                false
                             )
                             .await;
                         },
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 7a83f76393..921236a030 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -571,9 +571,10 @@ pub async fn monitor_db(
     base_internal_url: &str,
     rsmq: Option<MultiplexedRsmq>,
     server_mode: bool,
+    initial_load: bool,
 ) {
     let zombie_jobs_f = async {
-        if server_mode {
+        if server_mode && !initial_load {
             handle_zombie_jobs(db, base_internal_url, rsmq.clone(), "server").await;
             match handle_zombie_flows(db, rsmq.clone()).await {
                 Err(err) => {
@@ -584,7 +585,7 @@ pub async fn monitor_db(
         }
     };
     let expired_items_f = async {
-        if server_mode {
+        if server_mode && !initial_load {
             delete_expired_items(&db).await;
         }
     };
@@ -605,7 +606,7 @@ pub async fn monitor_db(
     };
 
     let expose_queue_metrics_f = async {
-        if METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed) && server_mode {
+        if !initial_load && METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed) && server_mode {
             expose_queue_metrics(&db).await;
         }
     };