fix(engine): context cancel in postTakeWorkflowJob / initWorkflowRun (#6637)

yesnault · web-flow · commit 380a9ed499c0 · 2023-10-12T09:19:12.000+02:00
Signed-off-by: Yvonnick Esnault &lt;yvonnick.esnault@corp.ovh.com&gt;
diff --git a/engine/api/workflow_queue.go b/engine/api/workflow_queue.go
@@ -117,8 +117,10 @@ func (api *API) postTakeWorkflowJobHandler() service.Handler {
 			return err
 		}
 
-		workflow.ResyncNodeRunsWithCommits(ctx, api.mustDB(), api.Cache, *p, report)
-		go api.WorkflowSendEvent(context.Background(), *p, report)
+		workflow.ResyncNodeRunsWithCommits(api.Router.Background, api.mustDBWithCtx(api.Router.Background), api.Cache, *p, report)
+		api.GoRoutines.Exec(api.Router.Background, "workflow-send-event", func(ctx context.Context) {
+			api.WorkflowSendEvent(ctx, *p, report)
+		})
 
 		return service.WriteJSON(w, pbji, http.StatusOK)
 	}
diff --git a/engine/api/workflow_run.go b/engine/api/workflow_run.go
@@ -1127,7 +1127,7 @@ func (api *API) initWorkflowRun(ctx context.Context, projKey string, wf *sdk.Wor
 		report.Merge(ctx, r)
 		return report
 	}
-	workflow.ResyncNodeRunsWithCommits(ctx, api.mustDB(), api.Cache, *p, report)
+	workflow.ResyncNodeRunsWithCommits(api.Router.Background, api.mustDBWithCtx(api.Router.Background), api.Cache, *p, report)
 
 	api.initWorkflowRunPurge(ctx, wf)
 

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ func (api *API) postTakeWorkflowJobHandler() service.Handler {`
`117`	`117`	`return err`
`118`	`118`	`}`
`119`	`119`
`120`		`- workflow.ResyncNodeRunsWithCommits(ctx, api.mustDB(), api.Cache, *p, report)`
`121`		`- go api.WorkflowSendEvent(context.Background(), *p, report)`
	`120`	`+ workflow.ResyncNodeRunsWithCommits(api.Router.Background, api.mustDBWithCtx(api.Router.Background), api.Cache, *p, report)`
	`121`	`+ api.GoRoutines.Exec(api.Router.Background, "workflow-send-event", func(ctx context.Context) {`
	`122`	`+ api.WorkflowSendEvent(ctx, *p, report)`
	`123`	`+ })`
`122`	`124`
`123`	`125`	`return service.WriteJSON(w, pbji, http.StatusOK)`
`124`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ func (api API) initWorkflowRun(ctx context.Context, projKey string, wf sdk.Wor`
`1127`	`1127`	`report.Merge(ctx, r)`
`1128`	`1128`	`return report`
`1129`	`1129`	`}`
`1130`		`- workflow.ResyncNodeRunsWithCommits(ctx, api.mustDB(), api.Cache, *p, report)`
	`1130`	`+ workflow.ResyncNodeRunsWithCommits(api.Router.Background, api.mustDBWithCtx(api.Router.Background), api.Cache, *p, report)`
`1131`	`1131`
`1132`	`1132`	`api.initWorkflowRunPurge(ctx, wf)`
`1133`	`1133`