tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-23 13:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: pick jobs of the runner only

Browse Source
This commit is contained in:
Jason Song 2022-10-24 17:27:15 +08:00
parent ec673c0e79
commit 04634b9143
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
models/bots/task.go
View File

@ -179,17 +179,28 @@ func GetTaskByID(ctx context.Context, id int64) (*Task, error) {
return &task, nil return &task, nil
} }
func CreateTaskForRunner(runner *Runner) (*Task, bool, error) { func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, error) {
ctx, commiter, err := db.TxContext() dbCtx, commiter, err := db.TxContext()
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
defer commiter.Close() defer commiter.Close()
ctx = dbCtx.WithContext(ctx)
e := db.GetEngine(ctx) e := db.GetEngine(ctx)
jobCond := builder.NewCond()
if runner.RepoID != 0 {
jobCond = builder.Eq{"repo_id": runner.RepoID}
} else if runner.OwnerID != 0 {
jobCond = builder.In("repo_id", builder.Select("id").From("repository").Where(builder.Eq{"owner_id": runner.OwnerID}))
}
if jobCond.IsValid() {
jobCond = builder.In("run_id", builder.Select("id").From(Run{}.TableName()).Where(jobCond))
}
var jobs []*RunJob var jobs []*RunJob
if err := e.Where("task_id=? AND ready=?", 0, true).OrderBy("id").Find(&jobs); err != nil { if err := e.Where("task_id=? AND ready=?", 0, true).And(jobCond).OrderBy("id").Find(&jobs); err != nil {
return nil, false, err return nil, false, err
} }

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

@ -211,7 +211,7 @@ func (s *Service) UpdateLog(
} }
func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) { func (s *Service) pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, bool, error) {
t, ok, err := bots_model.CreateTaskForRunner(runner) t, ok, err := bots_model.CreateTaskForRunner(ctx, runner)
if err != nil { if err != nil {
return nil, false, fmt.Errorf("CreateTaskForRunner: %w", err) return nil, false, fmt.Errorf("CreateTaskForRunner: %w", err)
} }