修复任务恢复尝试范围并更新进度

This commit is contained in:
xuans committed 2026-09-30 10:56:04 +08:00
1 parent df88d00825
commit 9c3f2a6939
6 files changed
+90 -10

No files matched your search

+10 -10
View File
@@ -361,6 +361,16 @@ func (r *SQLTaskRepository) RecoverInterruptedTasks(ctx context.Context, finishe
rollback()
return 0, fmt.Errorf("\u8bfb\u53d6\u4e2d\u65ad\u4efb\u52a1\u5ba1\u8ba1\u6570\u91cf\u5931\u8d25\uff1a%w", err)
}
if _, err := tx.ExecContext(ctx, r.query(`UPDATE task_attempts
SET status = 'failed', message = ?, finished_at = ?
WHERE status IN ('queued', 'running', 'retry_wait', 'cancelling')
AND task_id IN (
SELECT id FROM tasks
WHERE status IN ('queued', 'running', 'retry_wait', 'cancelling')
)`), recoveryMessage, finishedAt); err != nil {
rollback()
return 0, fmt.Errorf("恢复中断任务尝试失败:%w", err)
}
result, err := tx.ExecContext(ctx, r.query(`UPDATE tasks
SET status = 'failed', stage = 'service_restart', message = ?, finished_at = ?, updated_at = ?
WHERE status IN ('queued', 'running', 'retry_wait', 'cancelling')`), recoveryMessage, finishedAt, finishedAt)
@@ -377,16 +387,6 @@ func (r *SQLTaskRepository) RecoverInterruptedTasks(ctx context.Context, finishe
rollback()
return 0, fmt.Errorf("\u4e2d\u65ad\u4efb\u52a1\u5ba1\u8ba1\u6570\u91cf\u4e0e\u4efb\u52a1\u6570\u91cf\u4e0d\u4e00\u81f4\uff1a\u5ba1\u8ba1 %d,\u4efb\u52a1 %d", auditCount, count)
}
if _, err := tx.ExecContext(ctx, r.query(`UPDATE task_attempts
SET status = 'failed', message = ?, finished_at = ?
WHERE status IN ('queued', 'running', 'retry_wait', 'cancelling')
AND task_id IN (
SELECT id FROM tasks
WHERE status = 'failed' AND stage = 'service_restart' AND finished_at = ?
)`), recoveryMessage, finishedAt, finishedAt); err != nil {
rollback()
return 0, fmt.Errorf("\u6062\u590d\u4e2d\u65ad\u4efb\u52a1\u5c1d\u8bd5\u5931\u8d25\uff1a%w", err)
}
if err := tx.Commit(); err != nil {
return 0, fmt.Errorf("\u63d0\u4ea4\u4e2d\u65ad\u4efb\u52a1\u6062\u590d\u4e8b\u52a1\u5931\u8d25\uff1a%w", err)
}
@@ -361,6 +361,42 @@ func TestSQLTaskRepositoryRecoversInterruptedTasksAndAttempts(t *testing.T) {
}
}
func TestSQLTaskRepositoryRecoveryDoesNotTouchHistoricalRestartTaskAttempts(t *testing.T) {
repository, db := newTaskRepositoryTest(t)
defer db.Close()
ctx := context.Background()
finished := time.Date(2026, 8, 30, 10, 0, 0, 0, time.UTC)
for _, item := range []Task{
{ID: "task-active-recovery", DomainID: "domain-1", TaskType: "certificate_issue", Status: "running", Stage: "certificate_issue"},
{ID: "task-historical-restart", DomainID: "domain-2", TaskType: "certificate_deploy", Status: "failed", Stage: "service_restart", Message: "历史恢复失败", FinishedAt: &finished},
} {
if err := repository.CreateTask(ctx, item); err != nil {
t.Fatalf("创建恢复边界任务失败:%v", err)
}
}
for _, attempt := range []TaskAttempt{
{ID: "attempt-active-recovery", TaskID: "task-active-recovery", AttemptNumber: 1, Stage: "certificate_issue", Status: "running"},
{ID: "attempt-historical-restart", TaskID: "task-historical-restart", AttemptNumber: 1, Stage: "certificate_deploy", Status: "running"},
} {
if err := repository.CreateAttempt(ctx, attempt); err != nil {
t.Fatalf("创建恢复边界任务尝试失败:%v", err)
}
}
if count, err := repository.RecoverInterruptedTasks(ctx, finished); err != nil || count != 1 {
t.Fatalf("恢复中断任务数量错误:%d %v", count, err)
}
recovered, err := repository.ListAttempts(ctx, "task-active-recovery")
if err != nil || len(recovered) != 1 || recovered[0].Status != "failed" {
t.Fatalf("活动任务尝试未被恢复:%+v %v", recovered, err)
}
historical, err := repository.ListAttempts(ctx, "task-historical-restart")
if err != nil || len(historical) != 1 || historical[0].Status != "running" || historical[0].FinishedAt != nil {
t.Fatalf("历史恢复任务尝试被错误修改:%+v %v", historical, err)
}
}
func TestSQLTaskRepositoryRecoveryAuditFailureRollsBack(t *testing.T) {
repository, db := newTaskRepositoryTest(t)
defer db.Close()