backend: rework job termination/cancellation after v2

windmill-labs · Feb 10, 2025 · a5b7706 · a5b7706
1 parent 702d73e
commit a5b7706
Show file tree

Hide file tree

Showing 35 changed files with 542 additions and 706 deletions.
diff --git a/backend/.sqlx/query-07982120afdeefd619777e9600cee9e0520babf241a2fe018ae550b3d13d33a9.json b/backend/.sqlx/query-07982120afdeefd619777e9600cee9e0520babf241a2fe018ae550b3d13d33a9.json
diff --git a/backend/.sqlx/query-115b35455f0e151386c85f0f239cf6b544ba58040742f46f31cea24389900142.json b/backend/.sqlx/query-115b35455f0e151386c85f0f239cf6b544ba58040742f46f31cea24389900142.json
diff --git a/backend/.sqlx/query-30c23ac8d77cea1d1fb8966da7b0fbdb85df82b240dc41b963e47a26ca324779.json b/backend/.sqlx/query-30c23ac8d77cea1d1fb8966da7b0fbdb85df82b240dc41b963e47a26ca324779.json
diff --git a/backend/.sqlx/query-75bd7b3be39b52ed468f9e1ae748f3aac4c5c373819a9a1a0afcf9c6625eae17.json b/backend/.sqlx/query-75bd7b3be39b52ed468f9e1ae748f3aac4c5c373819a9a1a0afcf9c6625eae17.json
diff --git a/backend/.sqlx/query-cca9425bfac22749f7ca4904227de7fc3c416120d33df76fbb16f1252e81a65c.json b/backend/.sqlx/query-cca9425bfac22749f7ca4904227de7fc3c416120d33df76fbb16f1252e81a65c.json
diff --git a/backend/.sqlx/query-d3dac23643070890e85c7668bbde3e75f1409bd6effc4da69b78444ddf21992b.json b/backend/.sqlx/query-d3dac23643070890e85c7668bbde3e75f1409bd6effc4da69b78444ddf21992b.json
diff --git a/backend/.sqlx/query-db2c20865d6fe6bd6752ec62a03267aa23c4e035cb0de8b25bada7ebf1c565fe.json b/backend/.sqlx/query-db2c20865d6fe6bd6752ec62a03267aa23c4e035cb0de8b25bada7ebf1c565fe.json
diff --git a/backend/.sqlx/query-db55295a2010e137f8637ac2bd472e171f14984852ac6ed529043f1466bf2481.json b/backend/.sqlx/query-db55295a2010e137f8637ac2bd472e171f14984852ac6ed529043f1466bf2481.json
diff --git a/backend/src/main.rs b/backend/src/main.rs
@@ -155,7 +155,6 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
                 &Uuid::nil(),
                 &res.content,
                 &mut 0,
-                &mut None,
                 &job_dir,
                 None,
                 "global",
@@ -174,7 +173,6 @@ async fn cache_hub_scripts(file_path: Option<String>) -> anyhow::Result<()> {
                 let envs = windmill_worker::get_common_bun_proc_envs(None).await;
                 let _ = windmill_worker::install_bun_lockfile(
                     &mut 0,
-                    &mut None,
                     &job_id,
                     "admins",
                     None,

diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
@@ -66,7 +66,7 @@ use windmill_common::{
     MONITOR_LOGS_ON_OBJECT_STORE, OTEL_LOGS_ENABLED, OTEL_METRICS_ENABLED, OTEL_TRACING_ENABLED,
     SERVICE_LOG_RETENTION_SECS,
 };
-use windmill_queue::cancel_job;
+use windmill_queue::cancel;
 use windmill_worker::{
     create_token_for_owner, handle_job_error, AuthedClient, SameWorkerPayload, SameWorkerSender,
     SendResult, BUNFIG_INSTALL_SCOPES, INSTANCE_PYTHON_VERSION, JOB_DEFAULT_TIMEOUT, KEEP_JOB_DIR,
@@ -1698,7 +1698,6 @@ async fn handle_zombie_jobs(db: &Pool<Postgres>, base_internal_url: &str, worker
             &client,
             &job,
             0,
-            None,
             error::Error::ExecutionErr(format!(
                 "Job timed out after no ping from job since {} (ZOMBIE_JOB_TIMEOUT: {}, same_worker: {})",
                 last_ping
@@ -1836,24 +1835,12 @@ async fn cancel_zombie_flow_job(
     workspace_id: &str,
     message: String,
 ) -> Result<(), error::Error> {
-    let mut tx = db.begin().await?;
     tracing::error!(
         "zombie flow detected: {} in workspace {}. Cancelling it.",
         id,
         workspace_id
     );
-    (tx, _) = cancel_job(
-        "monitor",
-        Some(message),
-        id,
-        workspace_id,
-        tx,
-        db,
-        true,
-        false,
-    )
-    .await?;
-    tx.commit().await?;
+    let _ = cancel(db, &[id], workspace_id, "monitor", &message, true, true).await?;
     Ok(())
 }