补齐任务部署结果持久化与查询接口
保存批量部署每台服务器的执行结果,新增数据库迁移、仓储查询和任务部署结果接口,并补充应用与仓储测试。
This commit is contained in:
1 parent
253f2bd824
commit
126cb6d566
11 files changed
+330
-1
No files matched your search
@@ -16,6 +16,7 @@ type ProjectTaskReader interface {
|
||||
ListVisibleTasks(context.Context, string, string, int) ([]Task, error)
|
||||
GetVisibleTask(context.Context, string, string) (Task, error)
|
||||
ListVisibleTaskAttempts(context.Context, string, string) ([]TaskAttempt, error)
|
||||
ListVisibleTaskDeploymentResults(context.Context, string, string) ([]TaskDeploymentResult, error)
|
||||
CancelVisibleTask(context.Context, string, string, string, *time.Time) error
|
||||
RetryVisibleTask(context.Context, string, string, *time.Time) (Task, TaskAttempt, error)
|
||||
}
|
||||
@@ -131,6 +132,38 @@ func (r *SQLTaskRepository) ListVisibleTaskAttempts(ctx context.Context, actorID
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) ListVisibleTaskDeploymentResults(ctx context.Context, actorID, taskID string) ([]TaskDeploymentResult, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return nil, errors.New("数据库连接不能为空")
|
||||
}
|
||||
predicate, args := taskVisibilityPredicate("tasks", domain.PermissionTaskRead)
|
||||
args[0] = strings.TrimSpace(actorID)
|
||||
args = append(args, strings.TrimSpace(taskID))
|
||||
rows, err := r.db.QueryContext(ctx, r.query(`SELECT results.task_id, results.attempt_id, results.attempt_number,
|
||||
results.result_index, results.server_id, results.server_name, results.status, results.message,
|
||||
results.backup_id, results.created_at
|
||||
FROM task_deployment_results results JOIN tasks ON tasks.id = results.task_id
|
||||
WHERE `+predicate+` AND results.task_id = ? ORDER BY results.attempt_number, results.result_index`), args...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询可见部署结果失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
items := make([]TaskDeploymentResult, 0)
|
||||
for rows.Next() {
|
||||
var item TaskDeploymentResult
|
||||
if err := rows.Scan(&item.TaskID, &item.AttemptID, &item.AttemptNumber, &item.ResultIndex,
|
||||
&item.ServerID, &item.Server, &item.Status, &item.Message, &item.BackupID, &item.CreatedAt); err != nil {
|
||||
return nil, fmt.Errorf("读取可见部署结果失败:%w", err)
|
||||
}
|
||||
item.CreatedAt = item.CreatedAt.UTC()
|
||||
items = append(items, item)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("读取可见部署结果列表失败:%w", err)
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) CancelVisibleTask(ctx context.Context, actorID, taskID, message string, finishedAt *time.Time) error {
|
||||
if r == nil || r.db == nil {
|
||||
return errors.New("数据库连接不能为空")
|
||||
|
||||
@@ -41,6 +41,19 @@ type TaskAttempt struct {
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
type TaskDeploymentResult struct {
|
||||
TaskID string `json:"task_id"`
|
||||
AttemptID string `json:"attempt_id"`
|
||||
AttemptNumber int `json:"attempt_number"`
|
||||
ResultIndex int `json:"result_index"`
|
||||
ServerID string `json:"server_id"`
|
||||
Server string `json:"server"`
|
||||
Status string `json:"status"`
|
||||
Message string `json:"message"`
|
||||
BackupID string `json:"backup_id,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
// ErrTaskAlreadyRunning 表示同一域名的同类任务仍处于活动状态。
|
||||
var ErrTaskAlreadyRunning = errors.New("同一域名的同类任务正在执行")
|
||||
|
||||
@@ -56,6 +69,8 @@ type TaskRepository interface {
|
||||
CreateAttempt(context.Context, TaskAttempt) error
|
||||
FinishAttempt(context.Context, string, string, string, *time.Time) error
|
||||
ListAttempts(context.Context, string) ([]TaskAttempt, error)
|
||||
RecordTaskDeploymentResults(context.Context, string, string, int, []TaskDeploymentResult) error
|
||||
ListTaskDeploymentResults(context.Context, string) ([]TaskDeploymentResult, error)
|
||||
}
|
||||
|
||||
type SQLTaskRepository struct {
|
||||
@@ -498,6 +513,99 @@ func (r *SQLTaskRepository) ListAttempts(ctx context.Context, taskID string) ([]
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) RecordTaskDeploymentResults(ctx context.Context, taskID, attemptID string, attemptNumber int, items []TaskDeploymentResult) error {
|
||||
if r == nil || r.db == nil {
|
||||
return errors.New("数据库连接不能为空")
|
||||
}
|
||||
taskID = strings.TrimSpace(taskID)
|
||||
attemptID = strings.TrimSpace(attemptID)
|
||||
if taskID == "" || attemptID == "" || attemptNumber <= 0 {
|
||||
return errors.New("任务和任务尝试标识不能为空")
|
||||
}
|
||||
if len(items) == 0 {
|
||||
return nil
|
||||
}
|
||||
tx, err := r.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
return fmt.Errorf("开始保存部署结果事务失败:%w", err)
|
||||
}
|
||||
rollback := func() {
|
||||
_ = tx.Rollback()
|
||||
}
|
||||
var attemptCount int
|
||||
if err := tx.QueryRowContext(ctx, r.query(`SELECT COUNT(*) FROM task_attempts WHERE id = ? AND task_id = ? AND attempt_number = ?`), attemptID, taskID, attemptNumber).Scan(&attemptCount); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("校验任务尝试失败:%w", err)
|
||||
}
|
||||
if attemptCount != 1 {
|
||||
rollback()
|
||||
return errors.New("任务尝试不存在或不匹配")
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, r.query(`DELETE FROM task_deployment_results WHERE task_id = ? AND attempt_id = ?`), taskID, attemptID); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("清理旧部署结果失败:%w", err)
|
||||
}
|
||||
seen := make(map[int]struct{}, len(items))
|
||||
for index, item := range items {
|
||||
resultIndex := item.ResultIndex
|
||||
if resultIndex < 0 {
|
||||
resultIndex = index
|
||||
}
|
||||
if _, exists := seen[resultIndex]; exists {
|
||||
rollback()
|
||||
return errors.New("部署结果序号重复")
|
||||
}
|
||||
seen[resultIndex] = struct{}{}
|
||||
createdAt := item.CreatedAt
|
||||
if createdAt.IsZero() {
|
||||
createdAt = time.Now().UTC()
|
||||
}
|
||||
if _, err := tx.ExecContext(ctx, r.query(`INSERT INTO task_deployment_results
|
||||
(task_id, attempt_id, attempt_number, result_index, server_id, server_name, status, message, backup_id, created_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`),
|
||||
taskID, attemptID, attemptNumber, resultIndex, strings.TrimSpace(item.ServerID), strings.TrimSpace(item.Server),
|
||||
strings.TrimSpace(item.Status), item.Message, strings.TrimSpace(item.BackupID), createdAt.UTC()); err != nil {
|
||||
rollback()
|
||||
return fmt.Errorf("保存部署结果失败:%w", err)
|
||||
}
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
return fmt.Errorf("提交部署结果事务失败:%w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *SQLTaskRepository) ListTaskDeploymentResults(ctx context.Context, taskID string) ([]TaskDeploymentResult, error) {
|
||||
if r == nil || r.db == nil {
|
||||
return nil, errors.New("数据库连接不能为空")
|
||||
}
|
||||
taskID = strings.TrimSpace(taskID)
|
||||
if taskID == "" {
|
||||
return nil, errors.New("任务 ID 不能为空")
|
||||
}
|
||||
rows, err := r.db.QueryContext(ctx, r.query(`SELECT task_id, attempt_id, attempt_number, result_index,
|
||||
server_id, server_name, status, message, backup_id, created_at
|
||||
FROM task_deployment_results WHERE task_id = ? ORDER BY attempt_number, result_index`), taskID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询部署结果失败:%w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
items := make([]TaskDeploymentResult, 0)
|
||||
for rows.Next() {
|
||||
var item TaskDeploymentResult
|
||||
if err := rows.Scan(&item.TaskID, &item.AttemptID, &item.AttemptNumber, &item.ResultIndex,
|
||||
&item.ServerID, &item.Server, &item.Status, &item.Message, &item.BackupID, &item.CreatedAt); err != nil {
|
||||
return nil, fmt.Errorf("读取部署结果失败:%w", err)
|
||||
}
|
||||
item.CreatedAt = item.CreatedAt.UTC()
|
||||
items = append(items, item)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("读取部署结果列表失败:%w", err)
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const taskSelect = `SELECT id, domain_id, task_type, status, stage, message, operator_id, certificate_version_id, idempotency_key, started_at, finished_at, created_at, updated_at, scope_type, project_id FROM tasks`
|
||||
|
||||
func scanTask(row rowScanner) (Task, error) {
|
||||
|
||||
@@ -89,6 +89,43 @@ func TestSQLTaskRepositoryLifecycle(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSQLTaskRepositoryPersistsDeploymentResultsByAttempt(t *testing.T) {
|
||||
repository, db := newTaskRepositoryTest(t)
|
||||
defer db.Close()
|
||||
ctx := context.Background()
|
||||
if err := repository.CreateTask(ctx, Task{
|
||||
ID: "task-deployment-results", DomainID: "domain-1", TaskType: "certificate_issue",
|
||||
Status: "running", Stage: "certificate_issue", Message: "正在执行证书工作流",
|
||||
}); err != nil {
|
||||
t.Fatalf("创建部署任务失败:%v", err)
|
||||
}
|
||||
if err := repository.CreateAttempt(ctx, TaskAttempt{
|
||||
ID: "attempt-deployment-results", TaskID: "task-deployment-results", AttemptNumber: 1,
|
||||
Stage: "certificate_issue", Status: "running", Message: "正在执行证书工作流",
|
||||
}); err != nil {
|
||||
t.Fatalf("创建部署任务尝试失败:%v", err)
|
||||
}
|
||||
created := time.Date(2026, 9, 29, 12, 0, 0, 0, time.UTC)
|
||||
if err := repository.RecordTaskDeploymentResults(ctx, "task-deployment-results", "attempt-deployment-results", 1, []TaskDeploymentResult{
|
||||
{ResultIndex: 0, ServerID: "server-1", Server: "第一台服务器", Status: "success", Message: "部署成功", CreatedAt: created},
|
||||
{ResultIndex: 1, ServerID: "server-2", Server: "第二台服务器", Status: "failed", Message: "部署失败", CreatedAt: created},
|
||||
}); err != nil {
|
||||
t.Fatalf("保存部署结果失败:%v", err)
|
||||
}
|
||||
items, err := repository.ListTaskDeploymentResults(ctx, "task-deployment-results")
|
||||
if err != nil || len(items) != 2 || items[0].AttemptNumber != 1 || items[1].ServerID != "server-2" || items[1].Status != "failed" {
|
||||
t.Fatalf("部署结果读取错误:%+v %v", items, err)
|
||||
}
|
||||
if err := repository.RecordTaskDeploymentResults(ctx, "task-deployment-results", "attempt-deployment-results", 1, []TaskDeploymentResult{
|
||||
{ResultIndex: 0, ServerID: "server-1", Server: "第一台服务器", Status: "success", Message: "重新部署成功", CreatedAt: created},
|
||||
}); err != nil {
|
||||
t.Fatalf("替换部署结果失败:%v", err)
|
||||
}
|
||||
items, err = repository.ListTaskDeploymentResults(ctx, "task-deployment-results")
|
||||
if err != nil || len(items) != 1 || items[0].Message != "重新部署成功" {
|
||||
t.Fatalf("部署结果替换错误:%+v %v", items, err)
|
||||
}
|
||||
}
|
||||
func TestSQLTaskRepositoryRejectsInvalidStatus(t *testing.T) {
|
||||
repository, db := newTaskRepositoryTest(t)
|
||||
defer db.Close()
|
||||
|
||||
Reference in new issue
Block a user