kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: canceling jobs

Browse Source
This commit is contained in:
Ruben Fiszel
2023-08-27 14:40:20 +02:00
parent b492fd9884
commit 0dfdf8fa1b
5 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/windmill-queue/src/jobs.rs
View File

@@ -140,9 +140,9 @@ pub async fn cancel_job<'c: 'async_recursion>(
return Ok((tx, None));
}
let job_running = job_running.unwrap();
if job_running.running
&& job_running.job_kind != JobKind::Flow
&& job_running.job_kind != JobKind::FlowPreview
if ((!job_running.running && job_running.root_job.is_none())
|| (job_running.job_kind == JobKind::Flow || job_running.job_kind == JobKind::FlowPreview))
&& !force_cancel
{
sqlx::query!(
@@ -362,6 +362,7 @@ pub async fn add_completed_job<R: rsmq_async::RsmqConnection + Clone + Send>(
.await
.map_err(|e| Error::InternalErr(format!("Could not add completed job {job_id}: {e}")))?;
// tracing::error!("Added completed job {:#?}", queued_job);
tx = delete_job(tx, &queued_job.workspace_id, job_id).await?;
if !queued_job.is_flow_step
&& queued_job.schedule_path.is_some()