Skip to content

feat(backend): retrieve root_job for MiniPulledJob + fix root job for flow jobs #6490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Sep 2, 2025
Merged

feat(backend): retrieve root_job for MiniPulledJob + fix root job for flow jobs #6490

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4b06192
feat(backend): retrieve root_job for MiniPulledJob + fix root job for…
hugocasa Aug 28, 2025
fed973a
nit
hugocasa Aug 28, 2025
abf8647
Merge remote-tracking branch 'origin/main' into hc/pass-root-job-to-m…
hugocasa Aug 29, 2025
906eebf
nits
hugocasa Aug 29, 2025
7fb8a7c
set root_job only if additional information meaning if not equal to i…
hugocasa Aug 29, 2025
e09e71d
nit
hugocasa Aug 29, 2025
9f57ef4
feat: add root job env var
hugocasa Sep 1, 2025
f71d33e
nits
hugocasa Sep 1, 2025
50d9936
fix build
hugocasa Sep 1, 2025
9a69947
nit
hugocasa Sep 1, 2025
7e1ec68
Merge remote-tracking branch 'origin/main' into hc/pass-root-job-to-m…
hugocasa Sep 1, 2025
464711f
fix build
hugocasa Sep 1, 2025
759ee88
nit
hugocasa Sep 2, 2025
5b75652
sqlx
hugocasa Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 77 additions & 0 deletions backend/.sqlx/query-02c945b5f18a56a826721f6884846d79167747742de236ce57f395561685adc0.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 0 additions & 71 deletions backend/.sqlx/query-b2e4dfaaee713604d0700ea4675ed2d4534e08471a60005bff85b952874c54c2.json
View file
Open in desktop

This file was deleted.

26 changes: 16 additions & 10 deletions ...6c391c4d0054a618b861464ee37239f1f1e0.json → ...7b578bc63792cdb0f7ddaeb82e9771287c22.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/ee-repo-ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d16e52d570f10dfdabb04a9061fe7ebdbf5a2aa1
a5911739330d09cdc084bb277e7e3db8f8d86801
1 change: 1 addition & 0 deletions backend/tests/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,7 @@ impl RunJob {
/* schedule_path */ None,
/* parent_job */ None,
/* root job */ None,
/* flow_innermost_root_job */ None,
/* job_id */ None,
/* is_flow_step */ false,
/* same_worker */ false,
Expand Down
3 changes: 3 additions & 0 deletions backend/windmill-api/src/apps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,7 @@ async fn create_app_internal<'a>(
None,
None,
None,
None,
false,
false,
None,
Expand Down Expand Up @@ -1467,6 +1468,7 @@ async fn update_app_internal<'a>(
None,
None,
None,
None,
false,
false,
None,
Expand Down Expand Up @@ -1780,6 +1782,7 @@ async fn execute_component(
None,
None,
None,
None,
job_id,
false,
false,
Expand Down
2 changes: 2 additions & 0 deletions backend/windmill-api/src/flows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ async fn create_flow(
None,
None,
None,
None,
false,
false,
None,
Expand Down Expand Up @@ -977,6 +978,7 @@ async fn update_flow(
None,
None,
None,
None,
false,
false,
None,
Expand Down
14 changes: 14 additions & 0 deletions backend/windmill-api/src/jobs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3875,6 +3875,7 @@ pub async fn run_flow_by_path_inner(
scheduled_for,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -3970,6 +3971,7 @@ pub async fn restart_flow(
scheduled_for,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -4066,6 +4068,7 @@ pub async fn run_script_by_path_inner(
scheduled_for,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -4215,6 +4218,7 @@ pub async fn run_workflow_as_code(
scheduled_for,
None,
Some(job_id),
None,
job.root_job.or(Some(job_id)),
run_query.job_id,
false,
Expand Down Expand Up @@ -4746,6 +4750,7 @@ pub async fn run_wait_result_job_by_path_get(
None,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -4897,6 +4902,7 @@ pub async fn run_wait_result_script_by_path_internal(
None,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -5012,6 +5018,7 @@ pub async fn run_wait_result_script_by_hash(
None,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -5130,6 +5137,7 @@ pub async fn run_wait_result_flow_by_path_internal(
scheduled_for,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down Expand Up @@ -5201,6 +5209,7 @@ async fn run_preview_script(
None,
None,
None,
None,
run_query.job_id,
false,
false,
Expand Down Expand Up @@ -5312,6 +5321,7 @@ async fn run_bundle_preview_script(
None,
None,
None,
None,
run_query.job_id,
false,
false,
Expand Down Expand Up @@ -5479,6 +5489,7 @@ async fn run_dependencies_job(
None,
None,
None,
None,
false,
false,
None,
Expand Down Expand Up @@ -5545,6 +5556,7 @@ async fn run_flow_dependencies_job(
None,
None,
None,
None,
false,
false,
None,
Expand Down Expand Up @@ -5885,6 +5897,7 @@ async fn run_preview_flow_job(
None,
None,
None,
None,
run_query.job_id,
false,
false,
Expand Down Expand Up @@ -6024,6 +6037,7 @@ pub async fn run_job_by_hash_inner(
scheduled_for,
None,
run_query.parent_job,
None,
run_query.root_job,
run_query.job_id,
false,
Expand Down
Loading
Loading