Skip to content

Commit 06f1065

Browse files
Add a transaction to pickTask (#33543)
In the old `pickTask`, when getting secrets or variables failed, the task could get stuck in the `running` status (task status is `running` but the runner did not fetch the task). To fix this issue, these steps should be in one transaction. --------- Co-authored-by: wxiaoguang <[email protected]>
1 parent 245ac32 commit 06f1065

File tree

3 files changed

+108
-96
lines changed

3 files changed

+108
-96
lines changed

routers/api/actions/runner/runner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (s *Service) FetchTask(
156156
// if the task version in request is not equal to the version in db,
157157
// it means there may still be some tasks not be assgined.
158158
// try to pick a task for the runner that send the request.
159-
if t, ok, err := pickTask(ctx, runner); err != nil {
159+
if t, ok, err := actions_service.PickTask(ctx, runner); err != nil {
160160
log.Error("pick task failed: %v", err)
161161
return nil, status.Errorf(codes.Internal, "pick task: %v", err)
162162
} else if ok {

routers/api/actions/runner/utils.go

Lines changed: 0 additions & 95 deletions
This file was deleted.

services/actions/task.go

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
// Copyright 2022 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package actions
5+
6+
import (
7+
"context"
8+
"fmt"
9+
10+
actions_model "code.gitea.io/gitea/models/actions"
11+
"code.gitea.io/gitea/models/db"
12+
secret_model "code.gitea.io/gitea/models/secret"
13+
14+
runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
15+
"google.golang.org/protobuf/types/known/structpb"
16+
)
17+
18+
func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) {
19+
var (
20+
task *runnerv1.Task
21+
job *actions_model.ActionRunJob
22+
)
23+
24+
if err := db.WithTx(ctx, func(ctx context.Context) error {
25+
t, ok, err := actions_model.CreateTaskForRunner(ctx, runner)
26+
if err != nil {
27+
return fmt.Errorf("CreateTaskForRunner: %w", err)
28+
}
29+
if !ok {
30+
return nil
31+
}
32+
33+
if err := t.LoadAttributes(ctx); err != nil {
34+
return fmt.Errorf("task LoadAttributes: %w", err)
35+
}
36+
job = t.Job
37+
38+
secrets, err := secret_model.GetSecretsOfTask(ctx, t)
39+
if err != nil {
40+
return fmt.Errorf("GetSecretsOfTask: %w", err)
41+
}
42+
43+
vars, err := actions_model.GetVariablesOfRun(ctx, t.Job.Run)
44+
if err != nil {
45+
return fmt.Errorf("GetVariablesOfRun: %w", err)
46+
}
47+
48+
needs, err := findTaskNeeds(ctx, job)
49+
if err != nil {
50+
return fmt.Errorf("findTaskNeeds: %w", err)
51+
}
52+
53+
taskContext, err := generateTaskContext(t)
54+
if err != nil {
55+
return fmt.Errorf("generateTaskContext: %w", err)
56+
}
57+
58+
task = &runnerv1.Task{
59+
Id: t.ID,
60+
WorkflowPayload: t.Job.WorkflowPayload,
61+
Context: taskContext,
62+
Secrets: secrets,
63+
Vars: vars,
64+
Needs: needs,
65+
}
66+
67+
return nil
68+
}); err != nil {
69+
return nil, false, err
70+
}
71+
72+
if task == nil {
73+
return nil, false, nil
74+
}
75+
76+
CreateCommitStatus(ctx, job)
77+
78+
return task, true, nil
79+
}
80+
81+
func generateTaskContext(t *actions_model.ActionTask) (*structpb.Struct, error) {
82+
giteaRuntimeToken, err := CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID)
83+
if err != nil {
84+
return nil, err
85+
}
86+
87+
gitCtx := GenerateGiteaContext(t.Job.Run, t.Job)
88+
gitCtx["token"] = t.Token
89+
gitCtx["gitea_runtime_token"] = giteaRuntimeToken
90+
91+
return structpb.NewStruct(gitCtx)
92+
}
93+
94+
func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (map[string]*runnerv1.TaskNeed, error) {
95+
taskNeeds, err := FindTaskNeeds(ctx, taskJob)
96+
if err != nil {
97+
return nil, err
98+
}
99+
ret := make(map[string]*runnerv1.TaskNeed, len(taskNeeds))
100+
for jobID, taskNeed := range taskNeeds {
101+
ret[jobID] = &runnerv1.TaskNeed{
102+
Outputs: taskNeed.Outputs,
103+
Result: runnerv1.Result(taskNeed.Result),
104+
}
105+
}
106+
return ret, nil
107+
}

0 commit comments

Comments
 (0)