refactor(queue): single-statement complete + dead-letter retirement

This commit is contained in:
姚章浩
2026-09-15 14:40:19 +08:00
parent 767684bb1f
commit e8dae5c7f7
3 changed files with 52 additions and 37 deletions
+19 -19
View File
@@ -53,25 +53,25 @@ RETURNING j.id, j.type, j.payload, j.state, j.priority, j.available_at,
`
const completeJobSQL = `
UPDATE jobs
SET state = 'completed',
completed_at = $3,
lease_owner = NULL,
lease_until = NULL,
updated_at = $3
WHERE id = $1
AND lease_owner = $2
AND state = 'running'
`
// retireOpenFailuresSQL keeps the dead-letter lane honest: once the job
// itself succeeded, its terminal-attempt projection is no longer waiting on
// a human (a later automatic retry recovered it).
const retireOpenFailuresSQL = `
UPDATE job_failures
SET state = 'requeued', resolved_at = $2, resolution_actor_ref = 'system:queue',
resolution_reason = '任务后续重试成功'
WHERE job_id = $1 AND state = 'open'
WITH done AS (
UPDATE jobs
SET state = 'completed',
completed_at = $3,
lease_owner = NULL,
lease_until = NULL,
updated_at = $3
WHERE id = $1
AND lease_owner = $2
AND state = 'running'
RETURNING id
), retired AS (
UPDATE job_failures
SET state = 'requeued', resolved_at = $3, resolution_actor_ref = 'system:queue',
resolution_reason = '任务后续重试成功'
WHERE job_id IN (SELECT id FROM done) AND state = 'open'
RETURNING 1
)
SELECT EXISTS (SELECT 1 FROM done)
`
const heartbeatJobSQL = `
+5 -14
View File
@@ -87,24 +87,15 @@ func (s *Store) List(ctx context.Context, limit int) ([]jobs.Job, error) {
}
func (s *Store) Complete(ctx context.Context, id, owner string, now time.Time) error {
tx, err := s.db.Begin(ctx)
if err != nil {
// completeJobSQL is one statement: mark the job completed AND retire any
// open dead-letter rows for it. The EXISTS projection is the lease check.
var completed bool
if err := s.db.QueryRow(ctx, completeJobSQL, id, owner, now).Scan(&completed); err != nil {
return fmt.Errorf("complete job: %w", err)
}
defer func() { _ = tx.Rollback(ctx) }()
tag, err := tx.Exec(ctx, completeJobSQL, id, owner, now)
if err != nil {
return fmt.Errorf("complete job: %w", err)
}
if tag.RowsAffected() != 1 {
if !completed {
return ErrLeaseLost
}
if _, err := tx.Exec(ctx, retireOpenFailuresSQL, id, now); err != nil {
return fmt.Errorf("complete job: retire failures: %w", err)
}
if err := tx.Commit(ctx); err != nil {
return fmt.Errorf("complete job: %w", err)
}
return nil
}
+28 -4
View File
@@ -14,7 +14,7 @@ import (
)
func TestStoreCompleteRejectsLostLease(t *testing.T) {
db := &recordingDB{commandTag: pgconn.NewCommandTag("UPDATE 0")}
db := &recordingDB{row: scanBoolRow(false)}
store := NewStore(db)
now := time.Date(2026, time.September, 3, 10, 0, 0, 0, time.UTC)
@@ -22,14 +22,38 @@ func TestStoreCompleteRejectsLostLease(t *testing.T) {
if !errors.Is(err, ErrLeaseLost) {
t.Fatalf("Complete() error = %v, want ErrLeaseLost", err)
}
if db.execSQL != completeJobSQL {
if db.queryRowSQL != completeJobSQL {
t.Fatal("Complete() did not use completeJobSQL")
}
if len(db.execArgs) != 3 || db.execArgs[0] != "job-1" || db.execArgs[1] != "worker-1" || db.execArgs[2] != now {
t.Fatalf("Complete() args = %#v", db.execArgs)
if len(db.queryRowArgs) != 3 || db.queryRowArgs[0] != "job-1" || db.queryRowArgs[1] != "worker-1" || db.queryRowArgs[2] != now {
t.Fatalf("Complete() args = %#v", db.queryRowArgs)
}
}
func TestStoreCompleteAcceptsOwnedLease(t *testing.T) {
db := &recordingDB{row: scanBoolRow(true)}
store := NewStore(db)
now := time.Date(2026, time.September, 3, 10, 0, 0, 0, time.UTC)
if err := store.Complete(context.Background(), "job-1", "worker-1", now); err != nil {
t.Fatalf("Complete() error = %v, want nil", err)
}
}
// scanBoolRow answers the EXISTS projection of completeJobSQL.
type scanBoolRow bool
func (row scanBoolRow) Scan(targets ...any) error {
if len(targets) != 1 {
return errors.New("scanBoolRow expects one target")
}
out, ok := targets[0].(*bool)
if !ok {
return errors.New("scanBoolRow target is not *bool")
}
*out = bool(row)
return nil
}
func TestStoreHeartbeatAndFailRejectLostLease(t *testing.T) {
now := time.Date(2026, time.September, 3, 10, 0, 0, 0, time.UTC)
tests := []struct {