feat(worker): 接线恢复派发台账并按激活登记启用
为什么:派发协议只在 worker 里装配却没人接,就等于只写了 store mock。同步失败的自动 rollback 与维护恢复都必须拿到同一份台账; baseline 只读装配永远不传,避免建基线顺带获得恢复写许可。 开关 LIBRARY_RESTORE_DISPATCH_V2 默认关闭,且只是"允许装配": 治理库没有该目标的未撤销激活登记时,Prepare/Acquire 直接 fail closed。 验证:cmd/worker 单测覆盖默认关闭/显式开启/无台账三态; v071 真 ES 用例里自动 rollback 与手动恢复走的是同一个 Restore。
This commit is contained in:
@@ -15,6 +15,7 @@ import (
|
||||
|
||||
"knowledge-governance/internal/appconfig"
|
||||
"knowledge-governance/internal/librarymaintenance"
|
||||
"knowledge-governance/internal/libraryrelease"
|
||||
"knowledge-governance/internal/librarysnapshot"
|
||||
"knowledge-governance/internal/objectgateway"
|
||||
v071 "knowledge-governance/internal/releaseadapter/v071"
|
||||
@@ -89,7 +90,8 @@ func scopeConfigOf(config appconfig.Config, scope string) (scopeConfig, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig) (*v071.ProductionLibraryTarget, error) {
|
||||
func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig,
|
||||
gate libraryrelease.RestoreMarkerGate) (*v071.ProductionLibraryTarget, error) {
|
||||
objects, err := v071.NewS3ObjectStore(scope.s3)
|
||||
if err != nil {
|
||||
return nil, errors.New("生产对象存储配置无效")
|
||||
@@ -110,12 +112,18 @@ func newTarget(ctx context.Context, config appconfig.Config, scope scopeConfig)
|
||||
}
|
||||
writer = gateway
|
||||
}
|
||||
// DS01:派发身份只能来自本次真实 attempt(objectgateway claim)与原窗口作业。
|
||||
// gate 为 nil 时该能力整体关闭,adapter 对新续作 fail closed;baseline 永远传 nil。
|
||||
claim := objectgateway.ClaimFromContext(ctx)
|
||||
return v071.NewProductionLibraryTarget(ctx, v071.ProductionLibraryConfig{
|
||||
Postgres: config.LibraryProductionDatabaseURL, SearchURL: config.LibraryProductionElasticURL,
|
||||
SearchIndex: config.LibraryProductionIndex, Objects: writer, ObjectsReader: objects,
|
||||
ArchiveRoot: config.LibraryArchiveRoot,
|
||||
ObjectsBucket: config.LibraryProductionS3Bucket,
|
||||
MaxDocuments: 200000,
|
||||
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)
|
||||
}
|
||||
|
||||
@@ -130,13 +138,13 @@ func newBackups(config appconfig.Config, scope string, target *v071.ProductionLi
|
||||
|
||||
// OpenProductionStack 用部署注入的配置装配目标与独立预备份存储。
|
||||
// 契约以"要同步的这份快照"为准:生产必须向它看齐,而不是反过来。
|
||||
func OpenProductionStack(ctx context.Context, config appconfig.Config, scope, snapshotID, knownMapping string) (
|
||||
*v071.ProductionLibraryTarget, *v071.ProductionBackupStore, error) {
|
||||
func OpenProductionStack(ctx context.Context, config appconfig.Config, scope, snapshotID, knownMapping string,
|
||||
gate libraryrelease.RestoreMarkerGate) (*v071.ProductionLibraryTarget, *v071.ProductionBackupStore, error) {
|
||||
scopeCfg, err := scopeConfigOf(config, scope)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
target, err := newTarget(ctx, config, scopeCfg)
|
||||
target, err := newTarget(ctx, config, scopeCfg, gate)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
@@ -218,7 +226,7 @@ func OpenBaselineStack(ctx context.Context, config appconfig.Config, scope strin
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
target, err := newTarget(ctx, config, scopeCfg)
|
||||
target, err := newTarget(ctx, config, scopeCfg, nil)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user