feat: distribute tasks to runner

models/bots/task.go

@@ -5,20 +5,24 @@
 package bots
 
 import (
+	"context"
+
 	"code.gitea.io/gitea/core"
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/modules/timeutil"
+	runnerv1 "gitea.com/gitea/proto-go/runner/v1"
 )
 
 // Task represents a distribution of job
 type Task struct {
 	ID        int64
 	JobID     int64
+	Job       *RunJob `xorm:"-"`
 	Attempt   int64
 	RunnerID  int64  `xorm:"index"`
 	LogToFile bool   // read log from database or from storage
 	LogUrl    string // url of the log file in storage
-	Result    int64  // TODO: use runnerv1.Result
+	Result    runnerv1.Result
 	Started   timeutil.TimeStamp
 	Stopped   timeutil.TimeStamp
 	Created   timeutil.TimeStamp `xorm:"created"`
@@ -33,27 +37,49 @@ func (Task) TableName() string {
 	return "bots_task"
 }
 
-func CreateTask(runner *Runner) (task *Task, job *RunJob, run *Run, ok bool, err error) {
+// LoadAttributes load Job if not loaded
+func (task *Task) LoadAttributes(ctx context.Context) error {
+	if task == nil {
+		return nil
+	}
+
+	if task.Job == nil {
+		job, err := GetRunJobByID(ctx, task.JobID)
+		if err != nil {
+			return err
+		}
+		task.Job = job
+	}
+	if err := task.Job.LoadAttributes(ctx); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func CreateTask(runner *Runner) (*Task, bool, error) {
 	ctx, commiter, err := db.TxContext()
 	if err != nil {
-		return
+		return nil, false, err
 	}
 	defer commiter.Close()
 
 	var jobs []*RunJob
-	if err = db.GetEngine(ctx).Where("task_id = 0 AND ready = true").OrderBy("id").Find(jobs); err != nil {
-		return
+	if err := db.GetEngine(ctx).Where("task_id=? AND ready=?", 0, true).OrderBy("id").Find(&jobs); err != nil {
+		return nil, false, err
 	}
 
+	// TODO: a more efficient way to filter labels
+	var job *RunJob
 	labels := append(runner.AgentLabels, runner.CustomLabels...)
 	for _, v := range jobs {
-		if isSubset(v.RunsOn, labels) {
+		if isSubset(labels, v.RunsOn) {
 			job = v
 			break
 		}
 	}
 	if job == nil {
-		return
+		return nil, false, nil
 	}
 
 	now := timeutil.TimeStampNow()
@@ -61,33 +87,32 @@ func CreateTask(runner *Runner) (task *Task, job *RunJob, run *Run, ok bool, err
 	job.Started = now
 	job.Status = core.StatusRunning
 
-	task = &Task{
+	task := &Task{
 		JobID:    job.ID,
 		Attempt:  job.Attempt,
 		RunnerID: runner.ID,
 		Started:  now,
 	}
 
-	if err = db.Insert(ctx, task); err != nil {
-		return
+	if err := db.Insert(ctx, task); err != nil {
+		return nil, false, err
 	}
 
 	job.TaskID = task.ID
-	if _, err = db.GetEngine(ctx).ID(job.ID).Update(job); err != nil {
-		return
+	if _, err := db.GetEngine(ctx).ID(job.ID).Update(job); err != nil {
+		return nil, false, err
 	}
 
-	run = &Run{}
-	if _, err = db.GetEngine(ctx).ID(job.RunID).Get(run); err != nil {
-		return
+	task.Job = job
+	if err := task.Job.LoadAttributes(ctx); err != nil {
+		return nil, false, err
 	}
 
-	if err = commiter.Commit(); err != nil {
-		return
+	if err := commiter.Commit(); err != nil {
+		return nil, false, err
 	}
 
-	ok = true
-	return
+	return task, true, nil
 }
 
 func isSubset(set, subset []string) bool {