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

feat: update task status

Browse Source
This commit is contained in:
Jason Song
2022-10-20 18:27:27 +08:00
parent a8f74d4ec8
commit feab4b1601
11 changed files with 186 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
models/bots/run.go
View File

@@ -33,12 +33,12 @@ type Run struct {
Ref string
CommitSHA string
Event webhook.HookEventType
Token string // token for this task
Grant string // permissions for this task
EventPayload string `xorm:"LONGTEXT"`
Status core.BuildStatus `xorm:"index"`
StartTime timeutil.TimeStamp
EndTime timeutil.TimeStamp
Token string // token for this task
Grant string // permissions for this task
EventPayload string `xorm:"LONGTEXT"`
Status Status `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
Created timeutil.TimeStamp `xorm:"created"`
Updated timeutil.TimeStamp `xorm:"updated"`
}
@@ -85,7 +85,7 @@ func (r *Run) LoadAttributes(ctx context.Context) error {
}
func (run *Run) TakeTime() time.Duration {
return run.EndTime.AsTime().Sub(run.StartTime.AsTime())
return run.Started.AsTime().Sub(run.Stopped.AsTime())
}
func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) error {
@@ -154,8 +154,7 @@ func InsertRun(run *Run, jobs []*jobparser.SingleWorkflow) error {
JobID: id,
Needs: nil, // TODO: analyse needs
RunsOn: job.RunsOn(),
TaskID: 0,
Status: core.StatusPending,
Status: StatusWaiting,
})
}
if err := db.Insert(ctx, runJobs); err != nil {
@@ -188,6 +187,15 @@ func GetRunByID(ctx context.Context, id int64) (*Run, error) {
return &run, nil
}
func UpdateRun(ctx context.Context, run *Run, cols ...string) error {
sess := db.GetEngine(ctx).ID(run.ID)
if len(cols) > 0 {
sess.Cols(cols...)
}
_, err := sess.Update(run)
return err
}
type RunIndex db.ResourceIndex
func (RunIndex) TableName() string {

71
models/bots/run_job.go
View File

@@ -8,9 +8,10 @@ import (
"context"
"fmt"
"code.gitea.io/gitea/core"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/timeutil"
"golang.org/x/exp/slices"
)
// RunJob represents a job of a run
@@ -22,11 +23,11 @@ type RunJob struct {
Ready bool // ready to be executed
Attempt int64
WorkflowPayload []byte
JobID string // job id in workflow, not job's id
Needs []int64 `xorm:"JSON TEXT"`
RunsOn []string `xorm:"JSON TEXT"`
TaskID int64 // the latest task of the job
Status core.BuildStatus `xorm:"index"`
JobID string // job id in workflow, not job's id
Needs []int64 `xorm:"JSON TEXT"`
RunsOn []string `xorm:"JSON TEXT"`
TaskID int64 // the latest task of the job
Status Status `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
Created timeutil.TimeStamp `xorm:"created"`
@@ -88,3 +89,61 @@ func GetRunJobsByRunID(ctx context.Context, runID int64) ([]*RunJob, error) {
}
return jobs, nil
}
func UpdateRunJob(ctx context.Context, job *RunJob, cols ...string) error {
e := db.GetEngine(ctx)
sess := e.ID(job.ID)
if len(cols) > 0 {
sess.Cols(cols...)
}
if _, err := sess.Update(job); err != nil {
return err
}
if !(slices.Contains(cols, "status") || job.Status != 0) {
return nil
}
jobs, err := GetRunJobsByRunID(ctx, job.RunID)
if err != nil {
return err
}
runStatus := aggregateJobStatus(jobs)
run := &Run{
ID: job.RunID,
Status: runStatus,
}
if runStatus.IsDone() {
run.Stopped = timeutil.TimeStampNow()
}
return UpdateRun(ctx, run)
}
func aggregateJobStatus(jobs []*RunJob) Status {
allDone := true
allWaiting := true
hasFailure := false
for _, job := range jobs {
if !job.Status.IsDone() {
allDone = false
}
if job.Status != StatusWaiting {
allWaiting = false
}
if job.Status == StatusFailure {
hasFailure = true
}
}
if allDone {
if hasFailure {
return StatusFailure
}
return StatusSuccess
}
if allWaiting {
return StatusWaiting
}
return StatusRunning
}

38
models/bots/status.go Normal file
View File

@@ -0,0 +1,38 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package bots
// Status represents the status of Run, RunJob, Task, or TaskStep
type Status int
const (
StatusUnknown Status = iota // 0, consistent with runnerv1.Result_RESULT_UNSPECIFIED
StatusSuccess // 1, consistent with runnerv1.Result_RESULT_SUCCESS
StatusFailure // 2, consistent with runnerv1.Result_RESULT_FAILURE
StatusCancelled // 3, consistent with runnerv1.Result_RESULT_CANCELLED
StatusSkipped // 4, consistent with runnerv1.Result_RESULT_SKIPPED
StatusWaiting // 5
StatusRunning // 6
)
// String returns the string name of the Status
func (s Status) String() string {
return statusNames[s]
}
// IsDone returns whether the Status is final
func (s Status) IsDone() bool {
return s > StatusUnknown && s <= StatusSkipped
}
var statusNames = map[Status]string{
StatusUnknown: "unknown",
StatusWaiting: "waiting",
StatusRunning: "running",
StatusSuccess: "success",
StatusFailure: "failure",
StatusCancelled: "cancelled",
StatusSkipped: "skipped",
}

50
models/bots/task.go
View File

@@ -12,7 +12,6 @@ import (
"fmt"
"io"
"code.gitea.io/gitea/core"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
@@ -30,6 +29,7 @@ type Task struct {
Attempt int64
RunnerID int64 `xorm:"index"`
Result runnerv1.Result
Status Status `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
@@ -82,6 +82,9 @@ func (task *Task) LoadAttributes(ctx context.Context) error {
// FullSteps returns steps with "Set up job" and "Complete job"
func (task *Task) FullSteps() []*TaskStep {
// TODO: The logic here is too complex and tricky, may need to be rewritten
var firstStep, lastStep *TaskStep
if l := len(task.Steps); l > 0 {
firstStep = task.Steps[0]
@@ -93,10 +96,15 @@ func (task *Task) FullSteps() []*TaskStep {
Name: "Set up job",
LogLength: task.LogLength,
Started: task.Started,
Status: StatusWaiting,
}
if task.LogLength > 0 {
headStep.Status = StatusRunning
}
if firstStep != nil && firstStep.LogLength > 0 {
headStep.LogLength = firstStep.LogIndex
headStep.Stopped = firstStep.Started
headStep.Status = StatusSuccess
}
index += headStep.LogLength
@@ -107,11 +115,13 @@ func (task *Task) FullSteps() []*TaskStep {
tailStep := &TaskStep{
Name: "Complete job",
Stopped: task.Stopped,
Status: StatusWaiting,
}
if lastStep != nil && lastStep.Result != runnerv1.Result_RESULT_UNSPECIFIED {
tailStep.LogIndex = index
tailStep.LogLength = task.LogLength - tailStep.LogIndex
tailStep.Started = lastStep.Stopped
tailStep.Status = StatusSuccess
}
steps := make([]*TaskStep, 0, len(task.Steps)+2)
steps = append(steps, headStep)
@@ -202,13 +212,14 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) {
now := timeutil.TimeStampNow()
job.Attempt++
job.Started = now
job.Status = core.StatusRunning
job.Status = StatusRunning
task := &Task{
JobID: job.ID,
Attempt: job.Attempt,
RunnerID: runner.ID,
Started: now,
Status: StatusRunning,
}
var wolkflowJob *jobparser.Job
@@ -235,6 +246,7 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) {
Name: v.String(),
TaskID: task.ID,
Number: int64(i),
Status: StatusWaiting,
}
}
if _, err := e.Insert(steps); err != nil {
@@ -243,7 +255,7 @@ func CreateTaskForRunner(runner *Runner) (*Task, bool, error) {
task.Steps = steps
job.TaskID = task.ID
if _, err := e.ID(job.ID).Update(job); err != nil {
if err := UpdateRunJob(ctx, job); err != nil {
return nil, false, err
}
@@ -277,15 +289,27 @@ func UpdateTaskByState(state *runnerv1.TaskState) error {
}
defer commiter.Close()
e := db.GetEngine(ctx)
task := &Task{}
if _, err := db.GetEngine(ctx).ID(state.Id).Get(task); err != nil {
if _, err := e.ID(state.Id).Get(task); err != nil {
return err
}
task.Result = state.Result
task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix())
if task.Result != runnerv1.Result_RESULT_UNSPECIFIED {
task.Status = Status(task.Result)
task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix())
if err := UpdateRunJob(ctx, &RunJob{
ID: task.JobID,
Status: task.Status,
Stopped: task.Stopped,
}); err != nil {
return err
}
}
if _, err := db.GetEngine(ctx).ID(task.ID).Update(task); err != nil {
if _, err := e.ID(task.ID).Update(task); err != nil {
return err
}
@@ -293,14 +317,22 @@ func UpdateTaskByState(state *runnerv1.TaskState) error {
return err
}
prevStepDone := true
for _, step := range task.Steps {
if v, ok := stepStates[step.Number]; ok {
step.Result = v.Result
step.LogIndex = v.LogIndex
step.LogLength = v.LogLength
if _, err := db.GetEngine(ctx).ID(step.ID).Update(step); err != nil {
return err
}
}
if step.Result != runnerv1.Result_RESULT_UNSPECIFIED {
step.Status = Status(step.Result)
prevStepDone = true
} else if prevStepDone {
step.Status = StatusRunning
prevStepDone = false
}
if _, err := e.ID(step.ID).Update(step); err != nil {
return err
}
}

1
models/bots/task_step.go
View File

@@ -19,6 +19,7 @@ type TaskStep struct {
TaskID int64 `xorm:"index unique(task_number)"`
Number int64 `xorm:"index unique(task_number)"`
Result runnerv1.Result
Status Status `xorm:"index"`
LogIndex int64
LogLength int64
Started timeutil.TimeStamp

11
models/migrations/v-dev.go
View File

@@ -7,7 +7,6 @@ package migrations
import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
)
@@ -61,9 +60,9 @@ func addBotTables(x *xorm.Engine) error {
Token string // token for this task
Grant string // permissions for this task
EventPayload string `xorm:"LONGTEXT"`
Status int32 `xorm:"index"`
StartTime timeutil.TimeStamp
EndTime timeutil.TimeStamp
Status int `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
Created timeutil.TimeStamp `xorm:"created"`
Updated timeutil.TimeStamp `xorm:"updated"`
}
@@ -79,7 +78,7 @@ func addBotTables(x *xorm.Engine) error {
Needs []int64 `xorm:"JSON TEXT"`
RunsOn []string `xorm:"JSON TEXT"`
TaskID int64 // the latest task of the job
Status int32 `xorm:"index"`
Status int `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
Created timeutil.TimeStamp `xorm:"created"`
@@ -99,6 +98,7 @@ func addBotTables(x *xorm.Engine) error {
Attempt int64
RunnerID int64 `xorm:"index"`
Result int32
Status int `xorm:"index"`
Started timeutil.TimeStamp
Stopped timeutil.TimeStamp
LogFilename string // file name of log
@@ -117,6 +117,7 @@ func addBotTables(x *xorm.Engine) error {
TaskID int64 `xorm:"index unique(task_number)"`
Number int64 `xorm:"index unique(task_number)"`
Result int32
Status int `xorm:"index"`
LogIndex int64
LogLength int64
Started timeutil.TimeStamp