diff --git a/docs/architecture/ds01-activation-evidence.md b/docs/architecture/ds01-activation-evidence.md index a7867af..184e864 100644 --- a/docs/architecture/ds01-activation-evidence.md +++ b/docs/architecture/ds01-activation-evidence.md @@ -25,7 +25,8 @@ worker(LIBRARY_RESTORE_DISPATCH_V2=true) ## 2. 证据文件只声明身份,不声明结论 -v2 证据(`protocol_version=2`)字段: +v2 证据文档(`protocol_version=2`)字段。注意:台账行 `library_index_restore_dispatch_activation.protocol_version` +仍是 1(迁移 78 的派发协议身份约束),证据文档版本与台账协议版本不是同一个数字: | 字段 | 含义 | |---|---| diff --git a/internal/platform/postgres/library_restore_dispatch.go b/internal/platform/postgres/library_restore_dispatch.go index 906c8ed..1f9f01d 100644 --- a/internal/platform/postgres/library_restore_dispatch.go +++ b/internal/platform/postgres/library_restore_dispatch.go @@ -31,6 +31,10 @@ import ( var ErrRestoreDispatchNotActivated = libraryrelease.ErrRestoreDispatchUnavailable +// 台账行的 protocol_version 仍是 1(派发协议身份,迁移 78 的 CHECK 约束);证据文档 +// 升到 v2 只改变"激活输入要证明什么",不改表结构。两者不是同一个数字。 +const restoreDispatchActivationLedgerVersion = 1 + // ActivateRestoreDispatch 消费一份**可核验的**激活证据文件(协议 v2)。 // // 证据只声明目标身份、维护作业、journal 文件名/摘要与 writer 集合;实际事实由 @@ -61,7 +65,7 @@ INSERT INTO library_index_restore_dispatch_activation protocol_build, activated_by, drain_evidence_digest, evidence, attested_at, activated_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9::jsonb, $10, $11) ON CONFLICT (target_identity) DO NOTHING`, - evidence.TargetIdentity, evidence.ProtocolVersion, evidence.TargetFingerprint, evidence.TargetInstance, + evidence.TargetIdentity, restoreDispatchActivationLedgerVersion, evidence.TargetFingerprint, evidence.TargetInstance, evidence.GovernanceDatabase, evidence.ProtocolBuild, evidence.AttestedBy, verified.MaintenanceJournalSHA256, string(record), evidence.AttestedAt.UTC(), now.UTC()); err != nil { return fmt.Errorf("activate restore dispatch: %w", err) diff --git a/internal/platform/postgres/library_restore_dispatch_test.go b/internal/platform/postgres/library_restore_dispatch_test.go index 6ab0f51..fe1ebce 100644 --- a/internal/platform/postgres/library_restore_dispatch_test.go +++ b/internal/platform/postgres/library_restore_dispatch_test.go @@ -15,6 +15,8 @@ import ( "github.com/jackc/pgx/v5/pgxpool" + "github.com/jackc/pgx/v5" + "knowledge-governance/internal/governance" "knowledge-governance/internal/libraryrelease" "knowledge-governance/internal/version" @@ -410,7 +412,8 @@ func updateDS01MaintenanceRow(t *testing.T, store *Store, job, fingerprint strin if _, err := store.db.Exec(context.Background(), ` UPDATE library_instance_maintenance SET owner_job_id=$1, target_fingerprint=$2, level='instance', services=$3::jsonb, state=$4, - ingress_state='closed', released_at=NULL, updated_at=now() + ingress_state='closed', released_at=NULL, acquired_at=LEAST(acquired_at, now()-interval '20 minutes'), + updated_at=now() WHERE instance=$5`, job, fingerprint, string(raw), state, ds01TestInstance); err != nil { t.Fatalf("update maintenance row: %v", err) } @@ -419,8 +422,12 @@ WHERE instance=$5`, job, fingerprint, string(raw), state, ds01TestInstance); err func ds01JournalRowJob(t *testing.T, store *Store) string { t.Helper() var job string - if err := store.db.QueryRow(context.Background(), - `SELECT owner_job_id FROM library_instance_maintenance WHERE instance=$1`, ds01TestInstance).Scan(&job); err != nil { + err := store.db.QueryRow(context.Background(), + `SELECT owner_job_id FROM library_instance_maintenance WHERE instance=$1`, ds01TestInstance).Scan(&job) + if errors.Is(err, pgx.ErrNoRows) { + return "" + } + if err != nil { t.Fatalf("read maintenance job: %v", err) } return job @@ -461,6 +468,16 @@ func writeDS01ActivationEvidence(t *testing.T, evidence libraryrelease.RestoreDi func activateRestoreDispatchForTest(t *testing.T, store *Store, targetIdentity, fingerprint string) error { t.Helper() job := ds01JournalRowJob(t, store) + if job == "" { + job = "activation-window" + if _, err := store.db.Exec(context.Background(), ` +INSERT INTO library_instance_maintenance (instance, owner_job_id, owner_scope, target_fingerprint, level, + services, ingress_state, state, original_service_state, note, acquired_at, updated_at) +VALUES ($1,$2,'internal',$3,'instance','[]'::jsonb,'closed','needs_restore','','', + now()-interval '20 minutes',now())`, ds01TestInstance, job, fingerprint); err != nil { + t.Fatalf("seed maintenance row: %v", err) + } + } dir, _, digest := ds01Journal(t, job, nil) updateDS01MaintenanceRow(t, store, job, fingerprint, []string{ds01TestWriter}, "needs_restore") evidence := ds01ActivationEvidence(t, store, targetIdentity, fingerprint, job, digest)