fix(library): 收紧恢复派发真实绑定与同事务授权
build / build (push) Has been cancelled

为什么:Astra 复核证实五组实现缺陷——正式装配缺 scope/快照且来源与 before-image
混用;激活撤销不在 CAS 事务内、lease 用事务起始时间;激活只接受任意字符串且撤销可
被 SQL 重置/删除;准入忽略绑定冲突与 prepared 矛盾、收尾只看当前 plan;prepared 已
提交但 mark-intent 未落盘时被误判 legacy。

改了什么:
- 绑定来自原锚点(scope/来源快照/backup/实例/目标指纹/索引 UUID/恢复投递),每次
  重建都实时重读目标身份并与冻结值比较;
- activation 行锁与 CAS 同事务,lease 用 clock_timestamp(),同事务核对 job/operation/
  attempt/维护窗口/恢复 queue 与 operation,同 effect 换 plan 摘要拒绝;
- 激活消费带摘要的证据文件(writer 退出+排空、目标/治理库身份、有效期),撤销终局,
  down 在 activation 有行时拒绝;
- 前置/收尾共用权威窗口全集,绑定冲突与 prepared 矛盾零写 held,合法 dispatching+
  精确 marker 仍可确认;
- prepared 无 mark-intent 仅在绑定一致且无矛盾时补同内容意图,旧无台账意图仍 held。

验证:真 PG 锁等待覆盖撤销先胜/CAS 先胜/等锁跨租约/错锚点/plan 别名/恢复投递;
COMMIT 已到服务端但回包丢失与未决事务分别读回;真 ES+PG+对象存储的 DS01 用例全部
通过;go test ./... 全绿。未迁移正式库、未部署、未激活。
This commit is contained in:
姚章浩
2026-11-02 18:09:26 +08:00
parent 3bce6c7a3f
commit 513aa9e6f5
22 changed files with 2200 additions and 228 deletions
+64 -8
View File
@@ -90,7 +90,49 @@ func scopeConfigOf(config appconfig.Config, scope string) (scopeConfig, error) {
}, nil
}
func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig,
// RestoreDispatchWiring 是恢复派发身份的唯一装配来源:真实 attempt(objectgateway
// claim)、原 window 作业、部署目标实例与 scope。adapter 不接受调用方另填身份。
type RestoreDispatchWiring struct {
TargetIdentity string
Scope string
Instance string
OperationID string
WindowJobID string
AttemptOwner string
AttemptEpoch int64
RecoveryJobID string
RecoveryOperationID string
}
// RestoreDispatchWiringFor 把本次真实执行的 claim 映射成派发身份,并在字段缺失时
// 失败关闭。它不读取快照:来源/写前镜像只能从原 WriteSet 与 backup 引用取得。
func RestoreDispatchWiringFor(config appconfig.Config, scope string, claim objectgateway.Claim) (RestoreDispatchWiring, error) {
if scope != "internal" && scope != "external" {
return RestoreDispatchWiring{}, fmt.Errorf("未知 scope %q", scope)
}
identity := config.LibraryTargetIdentity()
if identity == "" || config.LibraryTargetInstance == "" || config.LibraryProductionDatabaseURL == "" {
return RestoreDispatchWiring{}, errors.New("恢复派发缺少目标身份/实例")
}
if (scope == "internal" && config.LibraryProductionInternalKB == "") ||
(scope == "external" && config.LibraryProductionExternalKB == "") {
return RestoreDispatchWiring{}, errors.New("恢复派发缺少 scope 对应的知识库")
}
if claim.JobID == "" || claim.OperationID == "" || claim.Owner == "" || claim.AttemptEpoch <= 0 {
return RestoreDispatchWiring{}, errors.New("恢复派发缺少本次真实 attempt 身份")
}
if (claim.RecoveryJobID == "") != (claim.RecoveryOperationID == "") {
return RestoreDispatchWiring{}, errors.New("恢复投递身份不完整")
}
return RestoreDispatchWiring{
TargetIdentity: identity, Scope: scope, Instance: config.LibraryTargetInstance,
OperationID: claim.OperationID, WindowJobID: claim.JobID,
AttemptOwner: claim.Owner, AttemptEpoch: claim.AttemptEpoch,
RecoveryJobID: claim.RecoveryJobID, RecoveryOperationID: claim.RecoveryOperationID,
}, nil
}
func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig, scopeName string,
gate libraryrelease.RestoreMarkerGate) (*v071.ProductionLibraryTarget, error) {
objects, err := v071.NewS3ObjectStore(scope.s3)
if err != nil {
@@ -115,16 +157,30 @@ func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig,
// DS01:派发身份只能来自本次真实 attempt(objectgateway claim)与原窗口作业。
// gate 为 nil 时该能力整体关闭,adapter 对新续作 fail closed;baseline 永远传 nil。
claim := objectgateway.ClaimFromContext(ctx)
return v071.NewProductionLibraryTarget(ctx, v071.ProductionLibraryConfig{
targetConfig := v071.ProductionLibraryConfig{
Postgres: config.LibraryProductionDatabaseURL, SearchURL: config.LibraryProductionElasticURL,
SearchIndex: config.LibraryProductionIndex, Objects: writer, ObjectsReader: objects,
ArchiveRoot: config.LibraryArchiveRoot,
ObjectsBucket: config.LibraryProductionS3Bucket,
MaxDocuments: 200000,
RestoreDispatch: gate, RestoreTargetIdentity: config.LibraryTargetIdentity(),
RestoreOperationID: claim.OperationID, RestoreWindowJobID: claim.JobID,
RestoreAttemptOwner: claim.Owner, RestoreAttemptEpoch: claim.AttemptEpoch,
}, scope.target)
RestoreDispatch: gate,
}
if gate != nil {
wiring, err := RestoreDispatchWiringFor(config, scopeName, claim)
if err != nil {
return nil, err
}
targetConfig.RestoreTargetIdentity = wiring.TargetIdentity
targetConfig.RestoreScope = wiring.Scope
targetConfig.RestoreInstance = wiring.Instance
targetConfig.RestoreOperationID = wiring.OperationID
targetConfig.RestoreWindowJobID = wiring.WindowJobID
targetConfig.RestoreAttemptOwner = wiring.AttemptOwner
targetConfig.RestoreAttemptEpoch = wiring.AttemptEpoch
targetConfig.RestoreRecoveryJobID = wiring.RecoveryJobID
targetConfig.RestoreRecoveryOperationID = wiring.RecoveryOperationID
}
return v071.NewProductionLibraryTarget(ctx, targetConfig, scope.target)
}
func newBackups(config appconfig.Config, scope string, target *v071.ProductionLibraryTarget,
@@ -144,7 +200,7 @@ func OpenProductionStack(ctx context.Context, config appconfig.Config, scope, sn
if err != nil {
return nil, nil, err
}
target, err := newTarget(ctx, config, scopeCfg, gate)
target, err := newTarget(ctx, config, scopeCfg, scope, gate)
if err != nil {
return nil, nil, err
}
@@ -226,7 +282,7 @@ func OpenBaselineStack(ctx context.Context, config appconfig.Config, scope strin
if err != nil {
return nil, nil, err
}
target, err := newTarget(ctx, config, scopeCfg, nil)
target, err := newTarget(ctx, config, scopeCfg, scope, nil)
if err != nil {
return nil, nil, err
}