Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: bcs-task mysql store add ctx and uniqueIndex #3483

Merged
merged 3 commits into from
Sep 3, 2024
Merged

feat: bcs-task mysql store add ctx and uniqueIndex #3483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1c2ae8
feat: bcs-task mysql store add uniqueIndex
ifooth Sep 2, 2024
e5589d9
feat: refine doWork errMsg
ifooth Sep 2, 2024
95ec164
feat: mysql store add ctx
ifooth Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions bcs-common/common/task/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,63 +374,58 @@ func (m *TaskManager) doWork(taskID string, stepName string) error { // nolint
state.updateStepSuccess(start)
return nil
}

retErr := fmt.Errorf("task %s step %s running failed, err=%s", taskID, stepName, stepErr)
// 单步骤主动revoke的不再重试
if errors.Is(stepErr, istep.ErrRevoked) {
state.updateStepFailure(start, stepErr, &taskEndStatus{status: types.TaskStatusFailure})
return retErr
}

state.updateStepFailure(start, stepErr, nil)
if step.GetRetryCount() < step.MaxRetries {

// 单步骤主动revoke或者没有重试次数时, 不再重试
if !errors.Is(stepErr, istep.ErrRevoked) && step.GetRetryCount() < step.MaxRetries {
retryIn := time.Second * time.Duration(retryNext(int(step.GetRetryCount())))
log.INFO.Printf("retry task %s step %s, retried=%d, maxRetries=%d, retryIn=%s",
taskID, step.GetName(), step.GetRetryCount(), step.MaxRetries, retryIn)
return tasks.NewErrRetryTaskLater(retErr.Error(), retryIn)
log.INFO.Printf("retry task %s step %s, err=%s, retried=%d, maxRetries=%d, retryIn=%s",
taskID, stepName, stepErr, step.GetRetryCount(), step.MaxRetries, retryIn)
return tasks.NewErrRetryTaskLater(stepErr.Error(), retryIn)
}

if step.GetSkipOnFailed() {
return nil
}

retErr := fmt.Errorf("task %s step %s running failed, err=%w", taskID, stepName, stepErr)
return retErr

case <-stepCtx.Done():
// step timeout
stepErr := fmt.Errorf("step exec timeout")

retErr := fmt.Errorf("%w, task=%s, step=%s", stepErr, taskID, stepName)
state.updateStepFailure(start, stepErr, nil)

if step.GetRetryCount() < step.MaxRetries {
retryIn := time.Second * time.Duration(retryNext(int(step.GetRetryCount())))
log.INFO.Printf("retry task %s step %s, retried=%d, maxRetries=%d, retryIn=%s",
taskID, step.GetName(), step.GetRetryCount(), step.MaxRetries, retryIn)
return tasks.NewErrRetryTaskLater(retErr.Error(), retryIn)
log.INFO.Printf("retry task %s step %s, err=%s, retried=%d, maxRetries=%d, retryIn=%s",
taskID, stepName, stepErr, step.GetRetryCount(), step.MaxRetries, retryIn)
return tasks.NewErrRetryTaskLater(stepErr.Error(), retryIn)
}

if step.GetSkipOnFailed() {
return nil
}

retErr := fmt.Errorf("task %s step %s running failed, err=%w", taskID, stepName, stepErr)
return retErr

case <-revokeCtx.Done():
// task revoke
stepErr := fmt.Errorf("task has been revoked")
retErr := fmt.Errorf("%w, task=%s, step=%s", stepErr, taskID, stepName)
state.updateStepFailure(start, stepErr, &taskEndStatus{status: types.TaskStatusRevoked})

// 取消指令, 不再重试
retErr := fmt.Errorf("task %s step %s running failed, err=%w", taskID, stepName, stepErr)
return retErr

case <-taskCtx.Done():
// task timeout
stepErr := fmt.Errorf("task exec timeout")
retErr := fmt.Errorf("%w, task=%s, step=%s", stepErr, taskID, stepName)
state.updateStepFailure(start, stepErr, &taskEndStatus{status: types.TaskStatusTimeout})

// 整个任务结束
retErr := fmt.Errorf("task %s step %s running failed, err=%w", taskID, stepName, stepErr)
return retErr

case <-m.ctx.Done():
Expand Down
7 changes: 4 additions & 3 deletions bcs-common/common/task/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package task

import (
"context"
"errors"
"fmt"
"time"

Expand Down Expand Up @@ -290,7 +291,7 @@ func (s *State) updateStepFailure(start time.Time, stepErr error, taskStatus *ta
}

// 重试流程中
if s.step.GetRetryCount() < s.step.MaxRetries {
if !errors.Is(stepErr, istep.ErrRevoked) && s.step.GetRetryCount() < s.step.MaxRetries {
s.task.SetStatus(types.TaskStatusRunning).SetMessage(taskFailMsg)
return
}
Expand All @@ -310,9 +311,9 @@ func (s *State) updateStepFailure(start time.Time, stepErr error, taskStatus *ta

func (s *State) isLastStep(step *types.Step) bool {
count := len(s.task.Steps)
// 没有step默认返回false
// 没有step也就没有后续流程, 返回true
if count == 0 {
return false
return true
}

// 非最后一步
Expand Down
21 changes: 12 additions & 9 deletions bcs-common/common/task/stores/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ func (s *mysqlStore) EnsureTable(ctx context.Context, dst ...any) error {
if len(dst) == 0 {
dst = []any{&TaskRecord{}, &StepRecord{}}
}
return s.db.AutoMigrate(dst...)
return s.db.WithContext(ctx).AutoMigrate(dst...)
}

func (s *mysqlStore) CreateTask(ctx context.Context, task *types.Task) error {
return s.db.Transaction(func(tx *gorm.DB) error {
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
record := getTaskRecord(task)
if err := tx.Create(record).Error; err != nil {
return err
Expand All @@ -103,11 +103,11 @@ func (s *mysqlStore) CreateTask(ctx context.Context, task *types.Task) error {
}

func (s *mysqlStore) ListTask(ctx context.Context, opt *iface.ListOption) ([]types.Task, error) {
return nil, nil
return nil, types.ErrNotImplemented
}

func (s *mysqlStore) UpdateTask(ctx context.Context, task *types.Task) error {
return s.db.Transaction(func(tx *gorm.DB) error {
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
updateTask := getUpdateTaskRecord(task)
if err := tx.Model(&TaskRecord{}).
Where("task_id = ?", task.TaskID).
Expand All @@ -133,10 +133,11 @@ func (s *mysqlStore) UpdateTask(ctx context.Context, task *types.Task) error {
}

func (s *mysqlStore) DeleteTask(ctx context.Context, taskID string) error {
return s.db.Transaction(func(tx *gorm.DB) error {
return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
if err := tx.Where("task_id = ?", taskID).Delete(&TaskRecord{}).Error; err != nil {
return err
}

if err := tx.Where("task_id = ?", taskID).Delete(&StepRecord{}).Error; err != nil {
return err
}
Expand All @@ -145,12 +146,14 @@ func (s *mysqlStore) DeleteTask(ctx context.Context, taskID string) error {
}

func (s *mysqlStore) GetTask(ctx context.Context, taskID string) (*types.Task, error) {
stepRecord := []*StepRecord{}
if err := s.db.Where("task_id = ?", taskID).Find(&stepRecord).Error; err != nil {
tx := s.db.WithContext(ctx)
taskRecord := TaskRecord{}
if err := tx.Where("task_id = ?", taskID).First(&taskRecord).Error; err != nil {
return nil, err
}
taskRecord := TaskRecord{}
if err := s.db.Where("task_id = ?", taskID).First(&taskRecord).Error; err != nil {

stepRecord := []*StepRecord{}
if err := tx.Where("task_id = ?", taskID).Find(&stepRecord).Error; err != nil {
return nil, err
}
return toTask(&taskRecord, stepRecord), nil
Expand Down
4 changes: 2 additions & 2 deletions bcs-common/common/task/stores/mysql/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ func (t *TaskRecord) BeforeUpdate(tx *gorm.DB) error {
// StepRecord 步骤记录
type StepRecord struct {
gorm.Model
TaskID string `json:"taskID" gorm:"type:varchar(255);index:idx_task_id"` // 索引
Name string `json:"name" gorm:"type:varchar(255)"`
TaskID string `json:"taskID" gorm:"type:varchar(255);uniqueIndex:idx_task_id_step_name"`
Name string `json:"name" gorm:"type:varchar(255);uniqueIndex:idx_task_id_step_name"`
Alias string `json:"alias" gorm:"type:varchar(255)"`
Executor string `json:"executor" gorm:"type:varchar(255)"`
Params map[string]string `json:"input" gorm:"type:text;serializer:json"`
Expand Down
Loading