From f0f5571518bd644429da4fa3148219da2e0e1042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Fri, 30 Oct 2026 01:33:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(worker):=20=E5=86=99=E9=9B=86=E5=90=88?= =?UTF-8?q?=E9=A2=84=E6=A3=80=E7=BB=8F=E5=8C=85=E8=A3=85=E5=B1=82=E8=BD=AC?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E7=BC=BA=E5=A4=B1=E5=8D=B3=E6=8B=92=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit orchestrator 用 target.(WriteSetPlanner) 决定要不要在写第一笔之前算写集合, 而 contentTrackedTarget 只转发了 Current/Apply/Verify/Restore,断言恒为假, 台账既不落盘也不登记。真实现场:10-29 两次真作业的预备份证据里没有 writeset_digest,归档根下没有 writesets/,崩溃接管必然无台账可读。 现在包装层显式转发;内层不支持预检时返回硬错误,不退回"没有台账也照写"。 用例断言包装后仍实现 WriteSetPlanner,并覆盖"内层不支持"的硬错误。 --- cmd/worker/library_handlers.go | 16 ++++++++++ cmd/worker/library_writeset_test.go | 49 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/cmd/worker/library_handlers.go b/cmd/worker/library_handlers.go index 64a0d90..9c23860 100644 --- a/cmd/worker/library_handlers.go +++ b/cmd/worker/library_handlers.go @@ -56,6 +56,22 @@ func (t *contentTrackedTarget) Restore(ctx context.Context, backup libraryreleas return t.inner.Restore(ctx, backup) } +// PlanWriteSet 必须显式转发:orchestrator 是按 `target.(WriteSetPlanner)` 这个 +// 类型断言决定要不要在写第一笔之前算写集合的,包一层之后断言就失败了——于是 +// 台账既不落盘也不登记,恢复/接管时根本没有"这次明确写了什么"可读。 +// 真实后果:2026-10-29 的两次真作业的预备份证据里都没有 writeset_digest, +// 归档根下也没有 writesets/;一旦 worker 崩在写入中间,接管必然失败。 +// +// 内层不支持预检时返回硬错误,不退回"没有台账也照写":那会让恢复只能按目标 +// 现状推断残渣,从而误删历史孤儿资源。 +func (t *contentTrackedTarget) PlanWriteSet(ctx context.Context, plan libraryrelease.WriteSetPlan) (libraryrelease.WriteSet, error) { + planner, ok := t.inner.(libraryrelease.WriteSetPlanner) + if !ok { + return libraryrelease.WriteSet{}, errors.New("目标实现不支持写集合预检:拒绝在没有可追溯写集合的情况下写生产") + } + return planner.PlanWriteSet(ctx, plan) +} + // libraryReleasePayload 是同步与恢复共用的队列载荷形状。 type libraryReleasePayload struct { LibraryJobID string `json:"library_job_id"` diff --git a/cmd/worker/library_writeset_test.go b/cmd/worker/library_writeset_test.go index e37b397..86dc808 100644 --- a/cmd/worker/library_writeset_test.go +++ b/cmd/worker/library_writeset_test.go @@ -5,6 +5,7 @@ import ( "errors" "os" "path/filepath" + "strings" "testing" "time" @@ -147,3 +148,51 @@ func TestLedgerBackupStoreRefusesWithoutWriteSet(t *testing.T) { t.Fatalf("接管必须带上持久化的写集合:%+v", ref) } } + +// 包装层必须把"写集合预检"这件事透出去:orchestrator 用的是类型断言, +// 少一个方法就等于静默跳过台账(真实后果:真作业没有 writeset_digest、也没有 +// writesets/ 文件,崩溃接管无台账可读)。 +type plainTarget struct{ applied int } + +func (t *plainTarget) Current(context.Context) (libraryrelease.CurrentState, error) { + return libraryrelease.CurrentState{}, nil +} +func (t *plainTarget) Apply(context.Context, libraryrelease.Stage, string) error { + t.applied++ + return nil +} +func (t *plainTarget) Verify(context.Context, libraryrelease.Expectation) error { return nil } +func (t *plainTarget) Restore(context.Context, libraryrelease.BackupRef) error { return nil } + +type planningTarget struct { + plainTarget + planned int +} + +func (t *planningTarget) PlanWriteSet(context.Context, libraryrelease.WriteSetPlan) (libraryrelease.WriteSet, error) { + t.planned++ + return libraryrelease.WriteSet{Version: libraryrelease.WriteSetVersion, JobID: "job-1", Target: "internal"}, nil +} + +func TestContentTrackedTargetForwardsWriteSetPlanning(t *testing.T) { + inner := &planningTarget{} + wrapped := &contentTrackedTarget{inner: inner, onApply: func() {}} + planner, ok := libraryrelease.Target(wrapped).(libraryrelease.WriteSetPlanner) + if !ok { + t.Fatal("包装后的目标必须仍然实现 WriteSetPlanner,否则写集合会被静默跳过") + } + if _, err := planner.PlanWriteSet(context.Background(), libraryrelease.WriteSetPlan{JobID: "job-1", Target: "internal"}); err != nil { + t.Fatalf("plan: %v", err) + } + if inner.planned != 1 { + t.Fatalf("预检必须落到内层目标,planned=%d", inner.planned) + } + + // 内层不支持预检 ⇒ 硬错误,不许"没有台账也照写"。 + strict := &contentTrackedTarget{inner: &plainTarget{}, onApply: func() {}} + if _, err := strict.PlanWriteSet(context.Background(), libraryrelease.WriteSetPlan{}); err == nil { + t.Fatal("内层不支持写集合预检时必须报错") + } else if !strings.Contains(err.Error(), "写集合") { + t.Fatalf("错误必须点名写集合:%v", err) + } +}