From f820e9b7dbe56a86828340f7b604076500a14801 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Mon, 10 Feb 2025 16:25:53 +0800 Subject: [PATCH 1/3] fix pickTask --- routers/api/actions/runner/utils.go | 107 ++++++++++++++++------------ 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index 0fd7ca5c447cf..dcdd5574a09d7 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -8,79 +8,92 @@ import ( "fmt" actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/services/actions" + actions_service "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" ) func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { - t, ok, err := actions_model.CreateTaskForRunner(ctx, runner) - if err != nil { - return nil, false, fmt.Errorf("CreateTaskForRunner: %w", err) - } - if !ok { - return nil, false, nil - } + var ( + task *runnerv1.Task + job *actions_model.ActionRunJob + ) + + if err := db.WithTx(ctx, func(ctx context.Context) error { + t, ok, err := actions_model.CreateTaskForRunner(ctx, runner) + if err != nil { + return fmt.Errorf("CreateTaskForRunner: %w", err) + } + if !ok { + return nil + } - secrets, err := secret_model.GetSecretsOfTask(ctx, t) - if err != nil { - return nil, false, fmt.Errorf("GetSecretsOfTask: %w", err) - } + if err := t.LoadAttributes(ctx); err != nil { + return fmt.Errorf("task LoadAttributes: %w", err) + } + job = t.Job - vars, err := actions_model.GetVariablesOfRun(ctx, t.Job.Run) - if err != nil { - return nil, false, fmt.Errorf("GetVariablesOfRun: %w", err) - } + secrets, err := secret_model.GetSecretsOfTask(ctx, t) + if err != nil { + return fmt.Errorf("GetSecretsOfTask: %w", err) + } + + vars, err := actions_model.GetVariablesOfRun(ctx, t.Job.Run) + if err != nil { + return fmt.Errorf("GetVariablesOfRun: %w", err) + } + + needs, err := findTaskNeeds(ctx, job) + if err != nil { + return fmt.Errorf("findTaskNeeds: %w", err) + } - actions.CreateCommitStatus(ctx, t.Job) + taskContext, err := generateTaskContext(t) + if err != nil { + return fmt.Errorf("generateTaskContext: %w", err) + } - task := &runnerv1.Task{ - Id: t.ID, - WorkflowPayload: t.Job.WorkflowPayload, - Context: generateTaskContext(t), - Secrets: secrets, - Vars: vars, + task = &runnerv1.Task{ + Id: t.ID, + WorkflowPayload: t.Job.WorkflowPayload, + Context: taskContext, + Secrets: secrets, + Vars: vars, + Needs: needs, + } + + return nil + }); err != nil { + return nil, false, err } - if needs, err := findTaskNeeds(ctx, t); err != nil { - log.Error("Cannot find needs for task %v: %v", t.ID, err) - // Go on with empty needs. - // If return error, the task will be wild, which means the runner will never get it when it has been assigned to the runner. - // In contrast, missing needs is less serious. - // And the task will fail and the runner will report the error in the logs. - } else { - task.Needs = needs + if task == nil { + return nil, false, nil } + actions_service.CreateCommitStatus(ctx, job) + return task, true, nil } -func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { - giteaRuntimeToken, err := actions.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) +func generateTaskContext(t *actions_model.ActionTask) (*structpb.Struct, error) { + giteaRuntimeToken, err := actions_service.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) if err != nil { - log.Error("actions.CreateAuthorizationToken failed: %v", err) + return nil, err } - gitCtx := actions.GenerateGiteaContext(t.Job.Run, t.Job) + gitCtx := actions_service.GenerateGiteaContext(t.Job.Run, t.Job) gitCtx["token"] = t.Token gitCtx["gitea_runtime_token"] = giteaRuntimeToken - taskContext, err := structpb.NewStruct(gitCtx) - if err != nil { - log.Error("structpb.NewStruct failed: %v", err) - } - - return taskContext + return structpb.NewStruct(gitCtx) } -func findTaskNeeds(ctx context.Context, task *actions_model.ActionTask) (map[string]*runnerv1.TaskNeed, error) { - if err := task.LoadAttributes(ctx); err != nil { - return nil, fmt.Errorf("task LoadAttributes: %w", err) - } - taskNeeds, err := actions.FindTaskNeeds(ctx, task.Job) +func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (map[string]*runnerv1.TaskNeed, error) { + taskNeeds, err := actions_service.FindTaskNeeds(ctx, taskJob) if err != nil { return nil, err } From e15a7c424230836105fd53fec9eb374df8399a95 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Tue, 11 Feb 2025 11:11:21 +0800 Subject: [PATCH 2/3] move to services layer --- routers/api/actions/runner/runner.go | 2 +- .../runner/utils.go => services/actions/task.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) rename routers/api/actions/runner/utils.go => services/actions/task.go (82%) diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index c55b30f7ebb78..f34dfb443b7d9 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -156,7 +156,7 @@ func (s *Service) FetchTask( // if the task version in request is not equal to the version in db, // it means there may still be some tasks not be assgined. // try to pick a task for the runner that send the request. - if t, ok, err := pickTask(ctx, runner); err != nil { + if t, ok, err := actions_service.PickTask(ctx, runner); err != nil { log.Error("pick task failed: %v", err) return nil, status.Errorf(codes.Internal, "pick task: %v", err) } else if ok { diff --git a/routers/api/actions/runner/utils.go b/services/actions/task.go similarity index 82% rename from routers/api/actions/runner/utils.go rename to services/actions/task.go index dcdd5574a09d7..8c822a5111c2e 100644 --- a/routers/api/actions/runner/utils.go +++ b/services/actions/task.go @@ -1,7 +1,7 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. +// Copyright 2025 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package runner +package actions import ( "context" @@ -10,13 +10,12 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" secret_model "code.gitea.io/gitea/models/secret" - actions_service "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" ) -func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { +func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) { var ( task *runnerv1.Task job *actions_model.ActionRunJob @@ -74,18 +73,18 @@ func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv return nil, false, nil } - actions_service.CreateCommitStatus(ctx, job) + CreateCommitStatus(ctx, job) return task, true, nil } func generateTaskContext(t *actions_model.ActionTask) (*structpb.Struct, error) { - giteaRuntimeToken, err := actions_service.CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) + giteaRuntimeToken, err := CreateAuthorizationToken(t.ID, t.Job.RunID, t.JobID) if err != nil { return nil, err } - gitCtx := actions_service.GenerateGiteaContext(t.Job.Run, t.Job) + gitCtx := GenerateGiteaContext(t.Job.Run, t.Job) gitCtx["token"] = t.Token gitCtx["gitea_runtime_token"] = giteaRuntimeToken @@ -93,7 +92,7 @@ func generateTaskContext(t *actions_model.ActionTask) (*structpb.Struct, error) } func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (map[string]*runnerv1.TaskNeed, error) { - taskNeeds, err := actions_service.FindTaskNeeds(ctx, taskJob) + taskNeeds, err := FindTaskNeeds(ctx, taskJob) if err != nil { return nil, err } From bf12fadb4f4754b3032d617517b2d661b4266dfe Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Tue, 11 Feb 2025 15:20:15 +0800 Subject: [PATCH 3/3] restore copyright year --- services/actions/task.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/actions/task.go b/services/actions/task.go index 8c822a5111c2e..bc54ade3478e6 100644 --- a/services/actions/task.go +++ b/services/actions/task.go @@ -1,4 +1,4 @@ -// Copyright 2025 The Gitea Authors. All rights reserved. +// Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT package actions