starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-10-18 16:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip stop_after_if evaluation for skipped (identity) flow steps (#8201)

Browse Source 
* fix: skip stop_after_if evaluation for skipped (identity) flow steps

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: relax is_identity_job guard to only require skip_if

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Ruben Fiszel
2026-03-03 07:00:27 +00:00
committed by GitHub
co-authored by Claude Opus 4.6
parent c5e04efa04
commit 76c9d39f60
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/worker_flow.rs
+21 -11
View File
@@ -549,6 +549,25 @@ pub async fn update_flow_status_after_job_completion_internal(
Ok::<_, Error>(args.clone())
};
// Pre-compute whether the completed job was an identity (skipped) job.
// When a step has skip_if set and the condition was true, the step runs
// as an identity job. We must skip the stop_after_if evaluation in that
// case because the result is just a pass-through of the previous step's
// result, not the output of the actual step logic.
let is_identity_job = if current_module.is_some_and(|m| m.skip_if.is_some()) {
sqlx::query_scalar!(
"SELECT kind = 'identity' FROM v2_job WHERE id = $1",
job_id_for_status
)
.fetch_optional(db)
.await
.map_err(|e| Error::internal_err(format!("error during identity job check: {e:#}")))?
.flatten()
.unwrap_or(false)
} else {
false
};
let (mut stop_early, mut stop_early_err_msg, mut skip_if_stop_early, continue_on_error) =
if stop_early_override.is_some()
&& !is_flow_stop_early_override
@@ -564,6 +583,7 @@ pub async fn update_flow_status_after_job_completion_internal(
let stop_early = success
&& !is_branch_all // we don't support stop_early per branch
&& !parallel_loop // we don't support anymore stop_early per iteration when parallel for loop (removed from frontend)
&& !is_identity_job // don't evaluate stop_after_if for skipped (identity) steps
&& if let Some(expr) = current_module
.stop_after_if
.as_ref()
@@ -1103,17 +1123,7 @@ pub async fn update_flow_status_after_job_completion_internal(
{
let is_skipped = (stop_early && skip_if_stop_early)
|| if current_module.as_ref().is_some_and(|m| m.skip_if.is_some()) {
sqlx::query_scalar!(
"SELECT kind = 'identity' FROM v2_job WHERE id = $1",
job_id_for_status
)
.fetch_optional(db)
.await
.map_err(|e| {
Error::internal_err(format!("error during skip check: {e:#}"))
})?
.flatten()
.unwrap_or(false)
is_identity_job
} else {
false
};