feat: add system task runner (#5680)

This commit is contained in:
Calcium-Ion
2026-06-24 17:16:21 +08:00
committed by GitHub
parent acb52d0f78
commit 5377192293
39 changed files with 2575 additions and 596 deletions
+264 -75
View File
@@ -16,41 +16,51 @@ const (
SystemTaskStatusSucceeded SystemTaskStatus = "succeeded"
SystemTaskStatusFailed SystemTaskStatus = "failed"
SystemTaskTypeLogCleanup = "log_cleanup"
SystemTaskTypeLogCleanup = "log_cleanup"
SystemTaskTypeChannelTest = "channel_test"
SystemTaskTypeModelUpdate = "model_update"
SystemTaskTypeMidjourneyPoll = "midjourney_poll"
SystemTaskTypeAsyncTaskPoll = "async_task_poll"
)
var ErrSystemTaskLockLost = errors.New("system task lock lost")
type SystemTask struct {
ID int64 `json:"id" gorm:"primary_key;AUTO_INCREMENT"`
TaskID string `json:"task_id" gorm:"type:varchar(64);uniqueIndex"`
Type string `json:"type" gorm:"type:varchar(64);index"`
Status SystemTaskStatus `json:"status" gorm:"type:varchar(32);index"`
ActiveKey *string `json:"active_key,omitempty" gorm:"type:varchar(64);uniqueIndex"`
Payload string `json:"payload" gorm:"type:text"`
State string `json:"state" gorm:"type:text"`
Result string `json:"result" gorm:"type:text"`
Error string `json:"error" gorm:"type:text"`
LockedBy string `json:"locked_by" gorm:"type:varchar(128);index"`
LockedUntil int64 `json:"locked_until" gorm:"bigint;index"`
CreatedAt int64 `json:"created_at" gorm:"bigint;index"`
UpdatedAt int64 `json:"updated_at" gorm:"bigint;index"`
ID int64 `json:"id" gorm:"primary_key"`
TaskID string `json:"task_id" gorm:"type:varchar(64);uniqueIndex"`
Type string `json:"type" gorm:"type:varchar(64);index"`
Status SystemTaskStatus `json:"status" gorm:"type:varchar(32);index"`
ActiveKey *string `json:"active_key,omitempty" gorm:"type:varchar(64);uniqueIndex"`
Payload string `json:"payload" gorm:"type:text"`
State string `json:"state" gorm:"type:text"`
Result string `json:"result" gorm:"type:text"`
Error string `json:"error" gorm:"type:text"`
LockedBy string `json:"locked_by" gorm:"type:varchar(128);index"`
CreatedAt int64 `json:"created_at" gorm:"bigint;index"`
UpdatedAt int64 `json:"updated_at" gorm:"bigint;index"`
}
type SystemTaskLock struct {
Type string `json:"type" gorm:"type:varchar(64);primaryKey"`
TaskID string `json:"task_id" gorm:"type:varchar(64);index"`
LockedBy string `json:"locked_by" gorm:"type:varchar(128);index"`
LockedUntil int64 `json:"locked_until" gorm:"bigint;index"`
UpdatedAt int64 `json:"updated_at" gorm:"bigint;index"`
}
type SystemTaskResponse struct {
ID int64 `json:"id"`
TaskID string `json:"task_id"`
Type string `json:"type"`
Status SystemTaskStatus `json:"status"`
ActiveKey string `json:"active_key,omitempty"`
Payload any `json:"payload"`
State any `json:"state"`
Result any `json:"result"`
Error string `json:"error"`
LockedBy string `json:"locked_by"`
LockedUntil int64 `json:"locked_until"`
CreatedAt int64 `json:"created_at"`
UpdatedAt int64 `json:"updated_at"`
ID int64 `json:"id"`
TaskID string `json:"task_id"`
Type string `json:"type"`
Status SystemTaskStatus `json:"status"`
ActiveKey *string `json:"active_key,omitempty"`
Payload any `json:"payload"`
State any `json:"state"`
Result any `json:"result"`
Error string `json:"error"`
LockedBy string `json:"locked_by"`
CreatedAt int64 `json:"created_at"`
UpdatedAt int64 `json:"updated_at"`
}
func (task *SystemTask) BeforeCreate(_ *gorm.DB) error {
@@ -64,6 +74,13 @@ func (task *SystemTask) BeforeCreate(_ *gorm.DB) error {
return nil
}
func (lock *SystemTaskLock) BeforeCreate(_ *gorm.DB) error {
if lock.UpdatedAt == 0 {
lock.UpdatedAt = common.GetTimestamp()
}
return nil
}
func GenerateSystemTaskID() (string, error) {
key, err := common.GenerateRandomCharsKey(32)
if err != nil {
@@ -72,7 +89,7 @@ func GenerateSystemTaskID() (string, error) {
return "systask_" + key, nil
}
func CreateSystemTask(taskType string, activeKey string, payload any, state any) (*SystemTask, error) {
func CreateSystemTask(taskType string, payload any, state any) (*SystemTask, error) {
taskID, err := GenerateSystemTaskID()
if err != nil {
return nil, err
@@ -87,14 +104,12 @@ func CreateSystemTask(taskType string, activeKey string, payload any, state any)
}
task := &SystemTask{
TaskID: taskID,
Type: taskType,
Status: SystemTaskStatusPending,
Payload: payloadText,
State: stateText,
}
if activeKey != "" {
task.ActiveKey = &activeKey
TaskID: taskID,
Type: taskType,
Status: SystemTaskStatusPending,
ActiveKey: &taskType,
Payload: payloadText,
State: stateText,
}
if err := DB.Create(task).Error; err != nil {
@@ -116,8 +131,7 @@ func GetSystemTaskByTaskID(taskID string) (*SystemTask, error) {
func GetActiveSystemTask(taskType string) (*SystemTask, error) {
var task SystemTask
err := DB.Where("type = ? AND active_key IS NOT NULL", taskType).
Where("status IN ?", activeSystemTaskStatuses()).
err := DB.Where("type = ? AND status IN ?", taskType, activeSystemTaskStatuses()).
Order("id desc").
First(&task).Error
if err != nil {
@@ -129,53 +143,181 @@ func GetActiveSystemTask(taskType string) (*SystemTask, error) {
return &task, nil
}
func FindRunnableSystemTasks(taskType string, now int64, limit int) ([]*SystemTask, error) {
func FindPendingSystemTasks(taskType string, limit int) ([]*SystemTask, error) {
var tasks []*SystemTask
if limit <= 0 {
limit = 1
}
err := DB.Where("type = ? AND status IN ? AND (locked_until = 0 OR locked_until < ?)", taskType, activeSystemTaskStatuses(), now).
err := DB.Where("type = ? AND status = ?", taskType, SystemTaskStatusPending).
Order("id asc").
Limit(limit).
Find(&tasks).Error
return tasks, err
}
func FindEarliestPendingSystemTasks(taskTypes []string) (map[string]*SystemTask, error) {
tasksByType := map[string]*SystemTask{}
if len(taskTypes) == 0 {
return tasksByType, nil
}
subQuery := DB.Model(&SystemTask{}).
Select("MIN(id)").
Where("type IN ? AND status = ?", taskTypes, SystemTaskStatusPending).
Group("type")
var tasks []*SystemTask
if err := DB.Where("id IN (?)", subQuery).Find(&tasks).Error; err != nil {
return nil, err
}
for _, task := range tasks {
tasksByType[task.Type] = task
}
return tasksByType, nil
}
func ListSystemTasks(limit int) ([]*SystemTask, error) {
if limit <= 0 {
limit = 20
}
if limit > 100 {
limit = 100
}
var tasks []*SystemTask
err := DB.Order("id desc").Limit(limit).Find(&tasks).Error
return tasks, err
}
// GetLatestSystemTask returns the most recent task row of the given type
// (any status) so the scheduler can decide whether enough time has elapsed
// since the last run. Returns (nil, nil) when no row exists.
func GetLatestSystemTask(taskType string) (*SystemTask, error) {
var task SystemTask
err := DB.Where("type = ?", taskType).Order("id desc").First(&task).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil
}
return nil, err
}
return &task, nil
}
func GetLatestSystemTasks(taskTypes []string) (map[string]*SystemTask, error) {
tasksByType := map[string]*SystemTask{}
if len(taskTypes) == 0 {
return tasksByType, nil
}
subQuery := DB.Model(&SystemTask{}).
Select("MAX(id)").
Where("type IN ?", taskTypes).
Group("type")
var tasks []*SystemTask
if err := DB.Where("id IN (?)", subQuery).Find(&tasks).Error; err != nil {
return nil, err
}
for _, task := range tasks {
tasksByType[task.Type] = task
}
return tasksByType, nil
}
func ClaimSystemTask(id int64, taskType string, runnerID string, lockUntil int64) (*SystemTask, bool, error) {
now := common.GetTimestamp()
var task SystemTask
if err := DB.Where("id = ? AND type = ? AND status = ?", id, taskType, SystemTaskStatusPending).First(&task).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, false, nil
}
return nil, false, err
}
acquired, expiredTaskID, err := acquireSystemTaskLock(taskType, task.TaskID, runnerID, now, lockUntil)
if err != nil || !acquired {
return nil, acquired, err
}
if expiredTaskID != "" && expiredTaskID != task.TaskID {
if err := MarkSystemTaskLeaseExpired(expiredTaskID); err != nil {
_ = ReleaseSystemTaskLock(task.TaskID, runnerID)
return nil, false, err
}
}
result := DB.Model(&SystemTask{}).
Where("id = ? AND type = ? AND status IN ? AND (locked_until = 0 OR locked_until < ? OR locked_by = ?)", id, taskType, activeSystemTaskStatuses(), now, runnerID).
Where("id = ? AND type = ? AND status = ?", id, taskType, SystemTaskStatusPending).
Updates(map[string]any{
"status": SystemTaskStatusRunning,
"locked_by": runnerID,
"locked_until": lockUntil,
"updated_at": now,
"status": SystemTaskStatusRunning,
"locked_by": runnerID,
"updated_at": now,
})
if result.Error != nil {
_ = ReleaseSystemTaskLock(task.TaskID, runnerID)
return nil, false, result.Error
}
if result.RowsAffected == 0 {
_ = ReleaseSystemTaskLock(task.TaskID, runnerID)
return nil, false, nil
}
var task SystemTask
if err := DB.Where("id = ?", id).First(&task).Error; err != nil {
return nil, false, err
}
return &task, true, nil
}
func UpdateSystemTaskState(taskID string, lockedBy string, state any, lockUntil int64) error {
func acquireSystemTaskLock(taskType string, taskID string, lockedBy string, now int64, lockUntil int64) (bool, string, error) {
lock := &SystemTaskLock{
Type: taskType,
TaskID: taskID,
LockedBy: lockedBy,
LockedUntil: lockUntil,
UpdatedAt: now,
}
if err := DB.Create(lock).Error; err == nil {
return true, "", nil
}
var existing SystemTaskLock
err := DB.Where("type = ?", taskType).First(&existing).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return false, "", nil
}
return false, "", err
}
if existing.LockedUntil >= now {
return false, "", nil
}
result := DB.Model(&SystemTaskLock{}).
Where("type = ? AND locked_until < ?", taskType, now).
Updates(map[string]any{
"task_id": taskID,
"locked_by": lockedBy,
"locked_until": lockUntil,
"updated_at": now,
})
if result.Error != nil {
return false, "", result.Error
}
if result.RowsAffected == 0 {
return false, "", nil
}
return true, existing.TaskID, nil
}
func UpdateSystemTaskState(taskID string, lockedBy string, state any) error {
stateText, err := marshalSystemTaskJSON(state)
if err != nil {
return err
}
now := common.GetTimestamp()
result := DB.Model(&SystemTask{}).
Where("task_id = ? AND status = ? AND locked_by = ?", taskID, SystemTaskStatusRunning, lockedBy).
Where("EXISTS (SELECT 1 FROM system_task_locks WHERE system_task_locks.task_id = system_tasks.task_id AND system_task_locks.locked_by = ? AND system_task_locks.locked_until >= ?)", lockedBy, now).
Updates(map[string]any{
"state": stateText,
"locked_until": lockUntil,
"updated_at": common.GetTimestamp(),
"state": stateText,
"updated_at": now,
})
if result.Error != nil {
return result.Error
@@ -186,21 +328,73 @@ func UpdateSystemTaskState(taskID string, lockedBy string, state any, lockUntil
return nil
}
func RenewSystemTaskLock(taskID string, lockedBy string, lockUntil int64) error {
now := common.GetTimestamp()
result := DB.Model(&SystemTaskLock{}).
Where("task_id = ? AND locked_by = ? AND locked_until >= ?", taskID, lockedBy, now).
Updates(map[string]any{
"locked_until": lockUntil,
"updated_at": now,
})
if result.Error != nil {
return result.Error
}
if result.RowsAffected == 0 {
return ErrSystemTaskLockLost
}
return nil
}
func MarkSystemTaskLeaseExpired(taskID string) error {
result := DB.Model(&SystemTask{}).
Where("task_id = ? AND status = ?", taskID, SystemTaskStatusRunning).
Updates(map[string]any{
"status": SystemTaskStatusFailed,
"active_key": nil,
"error": "task lease expired",
"updated_at": common.GetTimestamp(),
})
return result.Error
}
func ExpireStaleSystemTaskLocks(now int64) error {
var locks []*SystemTaskLock
if err := DB.Where("locked_until < ?", now).Find(&locks).Error; err != nil {
return err
}
for _, lock := range locks {
if err := MarkSystemTaskLeaseExpired(lock.TaskID); err != nil {
return err
}
result := DB.Where("type = ? AND task_id = ? AND locked_by = ? AND locked_until < ?", lock.Type, lock.TaskID, lock.LockedBy, now).
Delete(&SystemTaskLock{})
if result.Error != nil {
return result.Error
}
}
return nil
}
func ReleaseSystemTaskLock(taskID string, lockedBy string) error {
result := DB.Where("task_id = ? AND locked_by = ?", taskID, lockedBy).Delete(&SystemTaskLock{})
return result.Error
}
func FinishSystemTask(taskID string, lockedBy string, status SystemTaskStatus, resultPayload any, errorMessage string) error {
resultText, err := marshalSystemTaskJSON(resultPayload)
if err != nil {
return err
}
now := common.GetTimestamp()
result := DB.Model(&SystemTask{}).
Where("task_id = ? AND status = ? AND locked_by = ?", taskID, SystemTaskStatusRunning, lockedBy).
Where("EXISTS (SELECT 1 FROM system_task_locks WHERE system_task_locks.task_id = system_tasks.task_id AND system_task_locks.locked_by = ? AND system_task_locks.locked_until >= ?)", lockedBy, now).
Updates(map[string]any{
"status": status,
"active_key": nil,
"result": resultText,
"error": errorMessage,
"locked_by": "",
"locked_until": 0,
"updated_at": common.GetTimestamp(),
"status": status,
"active_key": nil,
"result": resultText,
"error": errorMessage,
"updated_at": now,
})
if result.Error != nil {
return result.Error
@@ -208,7 +402,7 @@ func FinishSystemTask(taskID string, lockedBy string, status SystemTaskStatus, r
if result.RowsAffected == 0 {
return ErrSystemTaskLockLost
}
return nil
return ReleaseSystemTaskLock(taskID, lockedBy)
}
func (task *SystemTask) DecodePayload(v any) error {
@@ -220,24 +414,19 @@ func (task *SystemTask) DecodeState(v any) error {
}
func (task *SystemTask) ToResponse() SystemTaskResponse {
activeKey := ""
if task.ActiveKey != nil {
activeKey = *task.ActiveKey
}
return SystemTaskResponse{
ID: task.ID,
TaskID: task.TaskID,
Type: task.Type,
Status: task.Status,
ActiveKey: activeKey,
Payload: decodeSystemTaskJSONValue(task.Payload),
State: decodeSystemTaskJSONValue(task.State),
Result: decodeSystemTaskJSONValue(task.Result),
Error: task.Error,
LockedBy: task.LockedBy,
LockedUntil: task.LockedUntil,
CreatedAt: task.CreatedAt,
UpdatedAt: task.UpdatedAt,
ID: task.ID,
TaskID: task.TaskID,
Type: task.Type,
Status: task.Status,
ActiveKey: task.ActiveKey,
Payload: decodeSystemTaskJSONValue(task.Payload),
State: decodeSystemTaskJSONValue(task.State),
Result: decodeSystemTaskJSONValue(task.Result),
Error: task.Error,
LockedBy: task.LockedBy,
CreatedAt: task.CreatedAt,
UpdatedAt: task.UpdatedAt,
}
}