From e9a643cc33abaebac17094671fa2e856210ef638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Sat, 10 Oct 2026 11:36:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(release):=20=E7=A6=81=E6=AD=A2=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=9C=AA=E8=A2=AB=E7=AE=97=E8=BF=9B=E6=9C=9F=E6=9C=9B?= =?UTF-8?q?=E7=AD=96=E7=95=A5=20=E2=80=94=E2=80=94=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E4=B8=8B=E4=B8=8D=E4=BA=86=E6=9E=B6=EF=BC=88?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=8E=E5=BB=BA=E6=89=B9=E4=B8=A4=E5=A4=84?= =?UTF-8?q?=E5=90=8C=E6=BA=90=E7=BC=BA=E9=99=B7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 界面验收实测(2026-10-10):把已发布到生产的 PDF 改为「禁止导入」后,发布通道既给不出 delete、也建不了 delete 批次。 根因:禁止导入只写 source_items.policy_state='blocked',而"期望策略"的解析只看 source_item_scope_overrides / directory_scope_rules / source_items.visibility—— 两处实现都不看 policy_state: 1) release_plan.go 的 source_truth:被禁止且生产侧存在的条目被算成 unchanged/present、 can_release=false → 永远不会出现 delete 动作; 2) release_batches.go 的 releaseDeleteReadyCTEs.source_truth:同样口径 → 计划即使给了 delete,创建封批仍被拒 422(实测原文「创建封批失败(HTTP 422)」)。 修复:两处都把 policy_state='blocked' 算进期望策略(各一行,注释写明成因)。 新增集成测试 release_plan_policy_state_integration_test.go:用 policy_state(真实路由的写法) 造"生产存在 + 已禁止"的条目,断言①计划给出 action=delete/can_release、②delete 批次可创建; 分别回退任一处修复,该测试即 FAIL(已实测两种回退都 FAIL)。 实测闭环:重新发布使生产存在(enable_status=enabled)→ 禁止导入 → 计划 delete(present/ can_release=true)→ v8 delete_count=1 → 批次 rb-8c1ad1c9…(sealed, action=delete) → 留档 20261010T033100Z + 门禁 PASS → 执行 rx-6c19232a… completed(项级 verified/delete、 production_revision=absent)→ 目标库该行 enable_status=disabled(行保留、检索停用、可恢复)。 附带:从未导入却被标为禁止的 82 条"等待测试"噪音不再占发布计划(195 → 113 项)。 证据与说明补进 docs/USER_FLOWS_ACCEPTANCE.md(C2b + F.3h)。 --- docs/USER_FLOWS_ACCEPTANCE.md | 27 +++++ internal/platform/postgres/release_batches.go | 6 +- internal/platform/postgres/release_plan.go | 8 +- ...ease_plan_policy_state_integration_test.go | 110 ++++++++++++++++++ 4 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 internal/platform/postgres/release_plan_policy_state_integration_test.go diff --git a/docs/USER_FLOWS_ACCEPTANCE.md b/docs/USER_FLOWS_ACCEPTANCE.md index 50856a9..8e7c250 100644 --- a/docs/USER_FLOWS_ACCEPTANCE.md +++ b/docs/USER_FLOWS_ACCEPTANCE.md @@ -149,6 +149,21 @@ 因为我用 `deploy-api-web.sh` 重建 api 时没叠 `compose.release-gates.yaml`,两道生产门禁被静默关掉; 补上门禁文件重新 up 后重试即成功 ✓(页面当时只在点击处回一句英文错误,很容易误判成功能坏了) +### C2b 下架(delete 动作)★2026-10-10 首次实测 +- 入口:**发布管理 → 发布计划** 里对「删除」行勾选 **「选择删除…」** → 勾选 **「确认删除生产知识」**(二次确认框) + → 填批次名 → **创建草稿批次** → 锁定 → 留档 → **授权发布**(同一固定语句 `publish-to-production`) +- 期望:执行项 `action=delete`、`production_revision=absent`、`state=verified`;目标库该知识**停用**(行保留,可恢复) +- 证据(2026-10-10):先把 PDF 重新发布使生产侧"存在"(`rx-80ad81d5…`,目标行 `enable_status=enabled`)→ + 在来源目录把它改为**禁止导入** → 计划给出 `相机线束固定孔位尺寸图.pdf → action=delete / production_state=present / can_release=true` ✓ + → v8 `rcs-8702357179…`(**delete_count=1**、113 项)→ 批次 `rb-8c1ad1c9ba849c7cfe3a5045b53eb880` + (`验收-下架孔位图-20261010`、**sealed**、1 项、`action=delete`、绑定 v8)→ 留档 `20261010T033100Z-0b217e8a` + 门禁 PASS + → 执行 `rx-6c19232a4ce1a19f937292a0a60b6c84` → **`completed`**(1/1、failed 0、项级 `verified`/`delete`、 + `production_revision=absent`);worker 日志 `in_scope=11 foreign=8 … degraded=true` ✓ + → **独立核对目标库**:`相机线束固定孔位尺寸图.pdf.pdf` 行仍在、`parse_status=completed`、 + **`enable_status=disabled`** ✓(下架=停用检索、不删行,可恢复) +- ⚠️ 过程中踩到并修掉 **Bug #6**(见 F.3h):禁止导入只写 `source_items.policy_state`,而**两处**"期望策略"解析 + (计划 + 建批 delete 就绪判定)都不看它 → 计划不给 delete、建批直接 422 + ### C3 查看结果 → 回滚 - 入口:**发布管理 → 查看结果** → 需要时 **回滚** → 确认语句 `rollback-production-release` - 期望:回滚后目标库该知识停用(**不删知识行**),wiki 页保持 @@ -244,6 +259,16 @@ 3. **wiki 通道的真实跨环境发布已跑通**(2026-10-10,见 C2):发现并修复"写入保留外来源页、校验却要求集合相等"的口径冲突(`eabe55b`);降级保留(`degraded=true`)现在是发布常态路径。 3b. **指标条的健康探测有误报**:`解析监控` 顶部把 Embedding 模型 / LLM 模型 / OSS / Redis-MQ / WeKnora API 显示为"阻断",但本期入库与发布全链路(上传/解析/索引/发布/回滚)都实际成功 → 探测口径待校正(不作阻塞项)。 3c. **`系统设置 → 服务配置` 的"测试端"探测报 404**:`test_weknora_base_url` 为空时 api 用 `TEST_WEKNORA_BASE_URL=http://app:8080` 探测,而 `app` 在治理栈网络内不可解析 → 显示"可达·不可接单";worker 走的是可用路径(本清单 B1/C2 均成功),仅探测口径问题。 +3h. **「禁止导入」未进入发布计划的期望策略 → 生产知识下不了架(已修)**:禁止导入写的是 + `source_items.policy_state='blocked'`,但"期望策略/desired_policy"的解析只看 + `source_item_scope_overrides` / `directory_scope_rules` / `source_items.visibility`,**两处都不看 policy_state**: + ① 发布计划(`release_plan.go`)把被禁止且生产侧已存在的条目算成 `unchanged/present`、`can_release=false` → 永远不给 delete; + ② 建批的 delete 就绪判定(`release_batches.go` 的 `releaseDeleteReadyCTEs`)同样口径 → 即使计划给了 delete,创建封批仍被拒 **422** + (实测原文:"创建封批失败(HTTP 422)")。修复=两处都把 `policy_state='blocked'` 算进期望策略(同一口径,各一行); + 新增集成测试用 **policy_state**(真实路由的写法)复现,并同时断言"计划出 delete"与"delete 批次可创建", + 回退任一处修复该测试即 FAIL ✓。附带效果:从未导入却被标为禁止的 82 条"等待测试"噪音不再占发布计划(195 → 113 项)。 + 注意:现有 release_authorization 集成测试用 `source_item_scope_overrides` 造 blocked(计划能识别), + 所以一直没暴露这个"测试与现实写法不一致"的偏差。 3g. **`deploy-api-web.sh` 会静默关掉生产门禁(已修)**:脚本的 `COMPOSE_FILES` 默认只叠 `compose.yaml`, 重建 api 时若不叠 `compose.release-gates.yaml`,`PRODUCTION_RELEASE_REQUESTS_ENABLED`/`PRODUCTION_BACKUP_RESTORE_VERIFIED` 变 false,生产授权接口静默关闭,页面只在点「授权发布」时回一句 `production release requests are disabled`。 @@ -259,6 +284,8 @@ 唯一约束 `uq_ui_setting_active` 只允许一条 active)恢复,两条 update 各影响 1 行,并复核线上值 ✓; 根因修复=给该用例加 per-test schema 隔离(照 `internal/monitoring`),复跑后线上设置不再被改动 ✓。 **规矩**:任何"创建并激活"的集成测试必须建独立 schema;只判 `TEST_DATABASE_URL` 存在就写共享库的用例一律视为危险。 +3i. **测试库侧的移除仍无页面入口**:生产侧下架已可通过发布通道完成(见 C2b);但"禁止导入后从**测试库**移除知识" + 仍只能靠 `test.remove` 工作流(变更集删除路径触发),需下架车道也只有按库计数、没有条目级列表与按钮。 3e. **发布/回滚结果页不自动刷新**:Release Worker 完成后,`发布管理` 的执行行仍显示"待执行"(首次与第二遍都遇到), 需手动 `刷新当前页面`/reload 才看到 `已完成`/`已回滚`。后端状态是对的(DB 已是终态),属展示层轮询缺口。 3d. **`release_executions.snapshot_verification_id` 为空**:发布前快照门禁确实生效(缺少/过期会 `release_target_snapshot_missing`),但执行行没有记下"用的是哪份快照",追踪性待补。 diff --git a/internal/platform/postgres/release_batches.go b/internal/platform/postgres/release_batches.go index 739b51f..1853699 100644 --- a/internal/platform/postgres/release_batches.go +++ b/internal/platform/postgres/release_batches.go @@ -74,7 +74,11 @@ acceptance_run_summary AS ( const releaseDeleteReadyCTEs = ` source_truth AS ( SELECT source.id, source.source_change, - COALESCE(item_rule.visibility, directory_rule.visibility, source.visibility) AS desired_policy + -- 与 release_plan 同一口径:「禁止导入」记在 source_items.policy_state 上, + -- 必须算进期望策略,否则 delete 就绪判定会把被禁止的条目当"仍然保留"→ 永远不 + -- delete-ready(创建封批直接 422)。2026-10-10 实测:计划已给出 delete,但建批仍被拒。 + CASE WHEN source.policy_state='blocked' THEN 'blocked' + ELSE COALESCE(item_rule.visibility, directory_rule.visibility, source.visibility) END AS desired_policy FROM source_items AS source LEFT JOIN source_item_scope_overrides AS item_rule ON item_rule.source_item_id = source.id LEFT JOIN LATERAL ( diff --git a/internal/platform/postgres/release_plan.go b/internal/platform/postgres/release_plan.go index aaa09a8..6114975 100644 --- a/internal/platform/postgres/release_plan.go +++ b/internal/platform/postgres/release_plan.go @@ -12,7 +12,13 @@ const listReleasePlanSQL = ` WITH ` + releaseGateCTEs + `, source_truth AS ( SELECT source.id AS source_item_id, source.title, source.revision, source.source_change, - COALESCE(item_rule.visibility, directory_rule.visibility, source.visibility) AS desired_policy + -- 「禁止导入」记录在 source_items.policy_state 上;这里必须把它算进期望策略, + -- 否则被禁止的条目会被当成"仍然保留"→ 生产侧已存在的它只会算出 unchanged, + -- 永远不产生 delete 动作,生产知识无法通过发布通道下架 + -- (2026-10-10 实测:PDF 已 enabled 于生产库、policy_state=blocked,计划给的却是 + -- unchanged/present、can_release=false)。 + CASE WHEN source.policy_state='blocked' THEN 'blocked' + ELSE COALESCE(item_rule.visibility, directory_rule.visibility, source.visibility) END AS desired_policy FROM source_items source LEFT JOIN source_item_scope_overrides item_rule ON item_rule.source_item_id=source.id LEFT JOIN LATERAL ( diff --git a/internal/platform/postgres/release_plan_policy_state_integration_test.go b/internal/platform/postgres/release_plan_policy_state_integration_test.go new file mode 100644 index 0000000..2c2d7c2 --- /dev/null +++ b/internal/platform/postgres/release_plan_policy_state_integration_test.go @@ -0,0 +1,110 @@ +package postgres + +import ( + "context" + "os" + "strings" + "testing" + "time" + + "github.com/jackc/pgx/v5/pgxpool" + + "knowledge-governance/internal/governance" + releaseworkflow "knowledge-governance/internal/workflows/release" +) + +// TestReleasePlanEmitsDeleteForBlockedPolicyStateIntegration +// +// 「禁止导入」在真实链路上只写 source_items.policy_state='blocked',并**不**写 +// source_item_scope_overrides。计划的期望策略若只看 override/directory/visibility, +// 就会把被禁止的条目当"仍然保留":生产侧已 enabled 的它只会算出 unchanged/present、 +// can_release=false,永远不产生 delete 动作 → 生产知识通过发布通道下不了架。 +// 2026-10-10 界面验收实测到这一幕(PDF 已 enabled 于 0b217e8a、policy_state=blocked, +// 计划给的却是 unchanged/present)。上面的 release_authorization 用例用 override 造 blocked, +// 所以一直没暴露这个偏差 —— 本用例专门用 policy_state 复现。 +func TestReleasePlanEmitsDeleteForBlockedPolicyStateIntegration(t *testing.T) { + databaseURL := isolatedIntegrationDatabaseURL(t, os.Getenv("TEST_DATABASE_URL")) + if databaseURL == "" { + t.Skip("TEST_DATABASE_URL is not set") + } + ctx := context.Background() + pool, err := pgxpool.New(ctx, databaseURL) + if err != nil { + t.Fatal(err) + } + defer pool.Close() + if err := ApplyMigrations(ctx, pool); err != nil { + t.Fatal(err) + } + store := NewStore(pool) + now := time.Date(2026, 9, 6, 5, 0, 0, 0, time.UTC) + if _, err := pool.Exec(ctx, `INSERT INTO source_connections (id, source_type, name) VALUES ('conn-manual', 'manual', 'Manual')`); err != nil { + t.Fatal(err) + } + insertReviewFixture(t, ctx, pool, 10, "tp-auth", now) + if _, err := store.ReviewPublication(ctx, governance.ReviewPublicationRequest{ + PublicationID: "tp-auth", Decision: governance.ReviewApproved, + DecidedVisibility: governance.VisibilityInternal, ReviewerRef: "engineer-1", + DecisionCode: "approved_for_release", Now: now.Add(time.Minute), + }); err != nil { + t.Fatal(err) + } + batch, err := store.CreateReleaseBatch(ctx, governance.CreateReleaseBatchRequest{ + Name: "Policy state batch", CreatedBy: "engineer-1", PublicationIDs: []string{"tp-auth"}, Now: now.Add(2 * time.Minute), + }) + if err != nil { + t.Fatal(err) + } + if _, err := store.SealReleaseBatch(ctx, governance.SealReleaseBatchRequest{BatchID: batch.ID, SealedBy: "engineer-2", Now: now.Add(3 * time.Minute)}); err != nil { + t.Fatal(err) + } + execution, err := store.AuthorizeReleaseBatch(ctx, governance.AuthorizeReleaseBatchRequest{ + BatchID: batch.ID, AuthorizedBy: "release-owner", AuthorizationCode: "production_release_authorized", Now: now.Add(4 * time.Minute), + }) + if err != nil { + t.Fatal(err) + } + plan, err := store.StartExecution(ctx, releaseworkflow.StartExecutionRequest{ + ExecutionID: execution.ID, JobID: execution.JobID, Operation: governance.ReleaseOperationPublish, Now: now.Add(5 * time.Minute), + }) + if err != nil || len(plan) != 1 { + t.Fatalf("publish plan=%#v error=%v", plan, err) + } + if err := store.CompleteItem(ctx, releaseworkflow.CompleteItemRequest{ + ExecutionID: execution.ID, PublicationID: "tp-auth", BundleSHA256: strings.Repeat("a", 64), + PreviousProductionRevision: "prod-v0", ProductionRevision: plan[0].ReleaseRevision, Now: now.Add(6 * time.Minute), + }); err != nil { + t.Fatal(err) + } + if err := store.FinishExecution(ctx, execution.ID, now.Add(7*time.Minute)); err != nil { + t.Fatal(err) + } + + // 发布完成 → 生产侧存在;此时按真实路由只写 policy_state。 + if _, err := pool.Exec(ctx, `UPDATE source_items SET policy_state='blocked' WHERE id='si-review-10'`); err != nil { + t.Fatal(err) + } + deletePlan, err := store.ListReleasePlan(ctx) + if err != nil { + t.Fatal(err) + } + if len(deletePlan.Items) != 1 { + t.Fatalf("blocked-but-live item must produce exactly one plan row, got %#v", deletePlan.Items) + } + item := deletePlan.Items[0] + if item.Action != "delete" || !item.CanRelease || item.PublicationID != "tp-auth" || item.ProductionState != "present" || item.Blocker != "" { + t.Fatalf("blocked policy_state must yield a releasable delete row, got %#v", item) + } + + // 第二处同源判定:建封批用的 releaseDeleteReadyCTEs 也解析期望策略。 + // 计划给出 delete 但这里没同步修,则创建封批会被门禁拒成 422(2026-10-10 实测)。 + deleteBatch, err := store.CreateReleaseBatch(ctx, governance.CreateReleaseBatchRequest{ + Name: "Delete batch", CreatedBy: "engineer-1", DeletePublicationIDs: []string{"tp-auth"}, Now: now.Add(8 * time.Minute), + }) + if err != nil { + t.Fatalf("blocked-but-live delete batch must be creatable, got error: %v", err) + } + if deleteBatch.ItemCount != 1 || deleteBatch.State != governance.ReleaseBatchDraft { + t.Fatalf("delete batch=%#v", deleteBatch) + } +}