ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: distribute tasks to runner

Browse Source
This commit is contained in:
Jason Song
2022-10-11 18:14:23 +08:00
parent 6f18f76577
commit 79966763c6
6 changed files with 182 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
routers/api/bots/runner/runner.go
View File

@@ -10,6 +10,7 @@ import (
"fmt"
"net/url"
"strings"
"time"
"code.gitea.io/gitea/core"
bots_model "code.gitea.io/gitea/models/bots"
@@ -140,6 +141,17 @@ func (s *Service) FetchTask(
task = t
}
// avoid crazy retry
if task == nil {
duration := 2 * time.Second
if deadline, ok := ctx.Deadline(); ok {
if d := time.Until(deadline) - time.Second; d < duration {
duration = d
}
}
time.Sleep(duration)
}
res := connect.NewResponse(&runnerv1.FetchTaskResponse{
Task: task,
})
@@ -165,7 +177,7 @@ func (s *Service) UpdateLog(
}
func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) {
t, job, run, ok, err := bots_model.CreateTask(runner)
t, ok, err := bots_model.CreateTask(runner)
if err != nil {
return nil, false, fmt.Errorf("CreateTask: %w", err)
}
@@ -174,31 +186,31 @@ func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*run
}
event := map[string]interface{}{}
_ = json.Unmarshal([]byte(run.EventPayload), &event)
_ = json.Unmarshal([]byte(t.Job.Run.EventPayload), &event)
// TODO: more context in https://docs.github.com/cn/actions/learn-github-actions/contexts#github-context
taskContext, _ := structpb.NewStruct(map[string]interface{}{
"event": event,
"run_id": fmt.Sprint(run.ID),
"run_number": fmt.Sprint(run.Index),
"run_attempt": fmt.Sprint(job.Attempt),
"actor": fmt.Sprint(run.TriggerUser.Name),
"repository": fmt.Sprint(run.Repo.Name),
"event_name": fmt.Sprint(run.Event.Event()),
"sha": fmt.Sprint(run.CommitSHA),
"ref": fmt.Sprint(run.Ref),
"run_id": fmt.Sprint(t.Job.ID),
"run_number": fmt.Sprint(t.Job.Run.Index),
"run_attempt": fmt.Sprint(t.Job.Attempt),
"actor": fmt.Sprint(t.Job.Run.TriggerUser.Name),
"repository": fmt.Sprint(t.Job.Run.Repo.Name),
"event_name": fmt.Sprint(t.Job.Run.Event.Event()),
"sha": fmt.Sprint(t.Job.Run.CommitSHA),
"ref": fmt.Sprint(t.Job.Run.Ref),
"ref_name": "",
"ref_type": "",
"head_ref": "",
"base_ref": "",
"token": "",
"repository_owner": fmt.Sprint(run.Repo.OwnerName),
"repository_owner": fmt.Sprint(t.Job.Run.Repo.OwnerName),
"retention_days": "",
})
task := &runnerv1.Task{
Id: t.ID,
WorkflowPayload: job.WorkflowPayload,
WorkflowPayload: t.Job.WorkflowPayload,
Context: taskContext,
Secrets: nil, // TODO: query secrets
}

21
routers/api/bots/runner/unary.go
View File

@@ -8,9 +8,11 @@ import (
"context"
"strings"
"code.gitea.io/gitea/models/bots"
bots_model "code.gitea.io/gitea/models/bots"
"github.com/bufbuild/connect-go"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unaryFunc connect.UnaryFunc) connect.UnaryFunc {
@@ -18,12 +20,15 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
if methodName(request) == "Register" {
return unaryFunc(ctx, request)
}
uuid := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID
// TODO: get runner from db, refuse request if it doesn't exist
r := &bots.Runner{
UUID: uuid,
token := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID
runner, err := bots_model.GetRunnerByToken(token)
if err != nil {
if _, ok := err.(*bots_model.ErrRunnerNotExist); ok {
return nil, status.Error(codes.Unauthenticated, "unregistered runner")
}
return nil, status.Error(codes.Internal, err.Error())
}
ctx = context.WithValue(ctx, runnerCtxKey{}, r)
ctx = context.WithValue(ctx, runnerCtxKey{}, runner)
return unaryFunc(ctx, request)
}
}))
@@ -38,9 +43,9 @@ func methodName(req connect.AnyRequest) string {
type runnerCtxKey struct{}
func GetRunner(ctx context.Context) *bots.Runner {
func GetRunner(ctx context.Context) *bots_model.Runner {
if v := ctx.Value(runnerCtxKey{}); v != nil {
if r, ok := v.(*bots.Runner); ok {
if r, ok := v.(*bots_model.Runner); ok {
return r
}
}