补齐任务幂等并发保护

新增三数据库任务幂等登记迁移,在任务创建事务中防止重复幂等键,并补充并发回归测试与进度清单。
This commit is contained in:
xuans committed 2026-09-30 02:00:36 +08:00
1 parent 163b3e9c5d
commit 7e14bbf42f
11 files changed
+168 -5

No files matched your search

+4 -1
View File
@@ -16,6 +16,7 @@ import (
//go:embed migrations/sqlite/0012_resource_replacement.sql migrations/mysql/0012_resource_replacement.sql migrations/postgres/0012_resource_replacement.sql
//go:embed migrations/sqlite/0013_history_scope.sql migrations/mysql/0013_history_scope.sql migrations/postgres/0013_history_scope.sql
//go:embed migrations/sqlite/0014_project_members.sql migrations/mysql/0014_project_members.sql migrations/postgres/0014_project_members.sql
//go:embed migrations/sqlite/0015_task_idempotency.sql migrations/mysql/0015_task_idempotency.sql migrations/postgres/0015_task_idempotency.sql
var migrationFiles embed.FS
func Migrate(ctx context.Context, db *sql.DB, driver string) error {
@@ -40,7 +41,7 @@ func Migrate(ctx context.Context, db *sql.DB, driver string) error {
return nil
}
const latestMigrationVersion = 14
const latestMigrationVersion = 15
// currentMigrationVersion 在执行业务迁移前拒绝新版数据库及不连续的迁移历史。
func currentMigrationVersion(ctx context.Context, db *sql.DB) (int, error) {
@@ -220,6 +221,8 @@ func migrationName(version int) string {
return "history_scope"
case 14:
return "project_members"
case 15:
return "task_idempotency"
default:
return "unknown"
}
@@ -0,0 +1,14 @@
CREATE TABLE task_idempotency (
domain_id VARCHAR(36) NOT NULL,
idempotency_key VARCHAR(255) NOT NULL,
task_id VARCHAR(36) NOT NULL,
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (domain_id, idempotency_key),
UNIQUE KEY uq_task_idempotency_task (task_id)
);
INSERT INTO task_idempotency (domain_id, idempotency_key, task_id, created_at)
SELECT domain_id, idempotency_key, MIN(id), MIN(created_at)
FROM tasks
WHERE idempotency_key <> ''
GROUP BY domain_id, idempotency_key;
@@ -0,0 +1,14 @@
CREATE TABLE task_idempotency (
domain_id TEXT NOT NULL,
idempotency_key TEXT NOT NULL,
task_id TEXT NOT NULL,
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (domain_id, idempotency_key),
UNIQUE (task_id)
);
INSERT INTO task_idempotency (domain_id, idempotency_key, task_id, created_at)
SELECT domain_id, idempotency_key, MIN(id), MIN(created_at)
FROM tasks
WHERE idempotency_key <> ''
GROUP BY domain_id, idempotency_key;
@@ -0,0 +1,14 @@
CREATE TABLE task_idempotency (
domain_id TEXT NOT NULL,
idempotency_key TEXT NOT NULL,
task_id TEXT NOT NULL,
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (domain_id, idempotency_key),
UNIQUE (task_id)
);
INSERT INTO task_idempotency (domain_id, idempotency_key, task_id, created_at)
SELECT domain_id, idempotency_key, MIN(id), MIN(created_at)
FROM tasks
WHERE idempotency_key <> ''
GROUP BY domain_id, idempotency_key;
+11
View File
@@ -102,6 +102,17 @@ func (s *Server) issueDomainAsTask(c *gin.Context) {
Message: "等待执行证书申请", IdempotencyKey: idempotencyKey, CreatedAt: now, UpdatedAt: now,
}
if err := s.tasks.CreateTask(c.Request.Context(), task); err != nil {
if idempotencyKey != "" {
if existing, lookupErr := s.tasks.FindTaskByIdempotencyKey(c.Request.Context(), domainID, idempotencyKey); lookupErr == nil {
status := http.StatusOK
if existing.Status == "queued" || existing.Status == "running" {
status = http.StatusConflict
}
c.JSON(status, gin.H{"task": existing, "replayed": true})
s.issueTaskMu.Unlock()
return
}
}
s.issueTaskMu.Unlock()
s.writeError(c, http.StatusInternalServerError, "创建证书任务失败", err)
return
@@ -127,6 +127,17 @@ func (r *SQLTaskRepository) CreateTask(ctx context.Context, item Task) error {
if err := validateTaskInsertResult(result); err != nil {
return err
}
if item.IdempotencyKey != "" {
idempotencyResult, idempotencyErr := tx.ExecContext(ctx, r.query(`INSERT INTO task_idempotency
(domain_id, idempotency_key, task_id, created_at) VALUES (?, ?, ?, ?)`),
item.DomainID, item.IdempotencyKey, item.ID, now)
if idempotencyErr != nil {
return fmt.Errorf("创建任务幂等记录失败:%w", idempotencyErr)
}
if err := validateTaskInsertResult(idempotencyResult); err != nil {
return err
}
}
if err := tx.Commit(); err != nil {
return fmt.Errorf("提交任务创建事务失败:%w", err)
}
@@ -209,3 +209,47 @@ func TestSQLTaskRepositoryRecoversInterruptedTasksAndAttempts(t *testing.T) {
t.Fatalf("\u5df2\u5b8c\u6210\u4efb\u52a1\u5c1d\u8bd5\u4e0d\u5e94\u88ab\u6062\u590d\u903b\u8f91\u4fee\u6539\uff1a%+v %v", completedAttempts, err)
}
}
func TestSQLTaskRepositoryRejectsConcurrentDuplicateIdempotencyKeys(t *testing.T) {
repository, db := newTaskRepositoryTest(t)
defer db.Close()
ctx := context.Background()
start := make(chan struct{})
results := make(chan error, 2)
for _, taskID := range []string{"task-idempotency-a", "task-idempotency-b"} {
go func(taskID string) {
<-start
results <- repository.CreateTask(ctx, Task{
ID: taskID, DomainID: "domain-1", TaskType: "certificate_issue",
Status: "queued", Stage: "queued", Message: "test",
IdempotencyKey: "duplicate-key-20260929",
})
}(taskID)
}
close(start)
var succeeded, failed int
for range 2 {
if err := <-results; err == nil {
succeeded++
} else {
failed++
}
}
if succeeded != 1 || failed != 1 {
t.Fatalf("unexpected concurrent idempotency result: success=%d failure=%d", succeeded, failed)
}
items, err := repository.ListTasks(ctx, "domain-1", 10)
if err != nil {
t.Fatal(err)
}
if len(items) != 1 || items[0].IdempotencyKey != "duplicate-key-20260929" {
t.Fatalf("duplicate idempotency key created multiple tasks: %+v", items)
}
stored, err := repository.FindTaskByIdempotencyKey(ctx, "domain-1", "duplicate-key-20260929")
if err != nil || stored.ID != items[0].ID {
t.Fatalf("idempotency lookup mismatch: %+v %v", stored, err)
}
}