resumed 分支里 LibraryVersions 的错误被忽略,FinalizeOnly 保持 false 后继续完整 apply:对"已登记版本并释放窗口、只差终态"的作业,这等于把同一份内容重写一遍目标, 与"最终只复核"的承诺相反。 现在接管先分类:finalize 阶段成功作为独立证据(不受版本查询影响)→ 只收尾;查询 失败且无阶段证据 → 未知,零写入、可重试;本快照被别的快照顶替 → 拒绝覆盖;其余才 按正常流程。 同时修释放幂等:Update*/Release* 对"已由本作业释放"的行返回 ErrMaintenanceReleased, 收尾重试视为已完成(部分释放后不会永久卡死),别的作业仍报未持有。真 PG 负例验证 两种情形。
This commit is contained in:
@@ -92,6 +92,9 @@ WHERE instance=$1 AND owner_job_id=$2 AND released_at IS NULL`, instance, ownerJ
|
||||
return fmt.Errorf("update instance maintenance: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_instance_maintenance", "instance", instance, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("instance maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
@@ -108,6 +111,9 @@ WHERE instance=$1 AND owner_job_id=$2 AND released_at IS NULL`, instance, ownerJ
|
||||
return fmt.Errorf("update instance maintenance ingress: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_instance_maintenance", "instance", instance, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("instance maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
@@ -121,6 +127,9 @@ WHERE instance=$1 AND owner_job_id=$2 AND released_at IS NULL`, instance, ownerJ
|
||||
return fmt.Errorf("release instance maintenance: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_instance_maintenance", "instance", instance, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("instance maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -10,6 +10,19 @@ import (
|
||||
"github.com/jackc/pgx/v5"
|
||||
)
|
||||
|
||||
var ErrMaintenanceReleased = errors.New("maintenance already released by this job")
|
||||
|
||||
// releasedByThisJob 判断"零行更新"是因为本作业已经释放过,还是根本没持有。
|
||||
func (s *Store) releasedByThisJob(ctx context.Context, table, keyColumn, key, ownerJobID string) bool {
|
||||
var owner string
|
||||
var released *time.Time
|
||||
query := "SELECT owner_job_id, released_at FROM " + table + " WHERE " + keyColumn + "=$1"
|
||||
if err := s.db.QueryRow(ctx, query, key).Scan(&owner, &released); err != nil {
|
||||
return false
|
||||
}
|
||||
return owner == ownerJobID && released != nil
|
||||
}
|
||||
|
||||
// LibraryMaintenance 是目标维护窗口的持有记录:一个 scope 只能有一个持有者。
|
||||
//
|
||||
// Level 说明这次维护到底动了什么:
|
||||
@@ -97,6 +110,9 @@ WHERE scope=$1 AND owner_job_id=$2 AND released_at IS NULL`, scope, ownerJobID,
|
||||
return fmt.Errorf("update library maintenance: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_maintenance", "scope", scope, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("library maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
@@ -114,6 +130,9 @@ WHERE scope=$1 AND owner_job_id=$2 AND released_at IS NULL`, scope, ownerJobID,
|
||||
return fmt.Errorf("update library maintenance ingress: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_maintenance", "scope", scope, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("library maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
@@ -127,6 +146,9 @@ WHERE scope=$1 AND owner_job_id=$2 AND released_at IS NULL`, scope, ownerJobID,
|
||||
return fmt.Errorf("release library maintenance: %w", err)
|
||||
}
|
||||
if tag.RowsAffected() == 0 {
|
||||
if s.releasedByThisJob(ctx, "library_maintenance", "scope", scope, ownerJobID) {
|
||||
return ErrMaintenanceReleased
|
||||
}
|
||||
return errors.New("library maintenance not held by this job")
|
||||
}
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user