🩹 Fix oversized review receipts and release confirmed failed submissions
This commit is contained in:
parent
817fa15c83
commit
973866fe2f
23
docs/review-decision-size-hotfix.md
Normal file
23
docs/review-decision-size-hotfix.md
Normal file
@ -0,0 +1,23 @@
|
||||
# 审核提交记录大小修复
|
||||
|
||||
2026-09-29:正式审核记录重复携带 HumanItem 的修改前、修改后及响应快照。
|
||||
带约 7 MB 重切历史的任务会生成超过 16 MiB 的 Mongo 记录,导致正式决定未生效。
|
||||
|
||||
## 本次行为
|
||||
|
||||
- 修改前记录仅保留 ID、版本及前序操作标识;修改后的完整快照保留一份,以兼容旧版在途恢复。
|
||||
- 回执的 HumanItem 保留工作流字段和 subject 标识,不重复返回 subject.payload;完整详情仍通过任务详情读取。
|
||||
- 实际写回只更新审核工作流字段,并以组织和任务版本校验,不覆盖 subject、标注、历史、权限或处理器数据。
|
||||
- 在写入审核计划前检查 BSON 大小,超过 15 MiB 时不执行正式效果,保留草稿并返回明确提示。
|
||||
- HTTP 错误后查询回执;completed 按成功处理,failed_before_effects 自动解除编辑保护;未知结果仍保留原提交标识。
|
||||
- 旧回执继续可读和恢复,无启动迁移、无客户历史清理。
|
||||
|
||||
## 验证和边界
|
||||
|
||||
本地 HTTP 回归使用 7 MiB 合成历史,旧实现产生约 22 MB 记录并失败;修复后记录小于 8 MiB,原历史不变。
|
||||
覆盖实际本地 Mongo 字段更新、过期版本拒绝、重复写拒绝,及既有质检/终审中断恢复测试。
|
||||
浏览器覆盖两个审核阶段的 500/409 已知失败解锁、完成回执和网络未知保护。
|
||||
|
||||
本次消除三重复制,不宣称无限容量。仍保留一份兼容快照,终审聚合特别多任务或单任务历史继续增长可能触发明确的大小门禁。
|
||||
后续需将大历史和大聚合恢复计划拆分持久化,并有独立迁移/回退设计;不得靠删除客户历史解决。
|
||||
回退旧镜像不会丢失本版回执中的完整任务快照,但旧版本仍会重复复制新提交;回退前核对在途决定,禁止恢复整库。
|
||||
@ -15,6 +15,7 @@ import (
|
||||
|
||||
"droboticflow/internal/domain"
|
||||
"github.com/go-chi/chi/v5"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
)
|
||||
|
||||
@ -216,19 +217,50 @@ func (s *server) finishReviewDecisionPreparation(r *http.Request) {
|
||||
_, _ = s.store.CompareAndSwapReviewOperation(ctx, *current, current.Revision)
|
||||
s.finishReviewWrite(op.SessionKey, op.ID)
|
||||
}
|
||||
func compactReviewResponse(response any) any {
|
||||
switch value := response.(type) {
|
||||
case domain.HumanItemRecord:
|
||||
value.Subject = domain.HumanSubjectRef{ItemKey: value.Subject.ItemKey, ArtifactID: value.Subject.ArtifactID, MediaType: value.Subject.MediaType}
|
||||
return value
|
||||
case map[string]any:
|
||||
copy := make(map[string]any, len(value))
|
||||
for key, entry := range value {
|
||||
copy[key] = compactReviewResponse(entry)
|
||||
}
|
||||
return copy
|
||||
default:
|
||||
return response
|
||||
}
|
||||
}
|
||||
|
||||
func (s *server) commitReviewPlan(w http.ResponseWriter, r *http.Request, effects []domain.ReviewDecisionEffect, sources []string, httpStatus int, response any) {
|
||||
op := operationFromRequest(r)
|
||||
if op == nil {
|
||||
renderError(w, 500, fmt.Errorf("review operation missing"))
|
||||
return
|
||||
}
|
||||
// BeforeItem is only a concurrency/recovery fence. Keep the full next Item
|
||||
// once for compatibility with older in-flight recovery handlers, not three
|
||||
// times in before/after/response. Never prune the source task's evidence.
|
||||
for i := range effects {
|
||||
if before := effects[i].BeforeItem; before != nil {
|
||||
effects[i].BeforeItem = &domain.HumanItemRecord{ID: before.ID, Version: before.Version, ReviewOperationID: before.ReviewOperationID}
|
||||
}
|
||||
}
|
||||
op.Effects = effects
|
||||
op.SourceItemIDs = sources
|
||||
op.HTTPStatus = httpStatus
|
||||
op.Response, _ = json.Marshal(response)
|
||||
op.Response, _ = json.Marshal(compactReviewResponse(response))
|
||||
op.Status = "applying"
|
||||
encoded, encodeErr := bson.Marshal(op)
|
||||
if encodeErr != nil || len(encoded) > 15*1024*1024 {
|
||||
s.failReviewPlan(r, op.ID, "审核提交记录过大,尚未产生正式变更;草稿已保留,请联系管理员处理。")
|
||||
renderJSON(w, http.StatusUnprocessableEntity, map[string]string{"code": "review_operation_too_large", "error": "审核提交记录过大,草稿已保留,请联系管理员处理。"})
|
||||
return
|
||||
}
|
||||
saved, e := s.store.CompareAndSwapReviewOperation(r.Context(), *op, op.Revision)
|
||||
if e != nil {
|
||||
s.failReviewPlan(r, op.ID, "审核提交记录保存失败,尚未产生正式变更;草稿已保留,请稍后重试或联系管理员。")
|
||||
renderError(w, 500, e)
|
||||
return
|
||||
}
|
||||
@ -243,6 +275,17 @@ func (s *server) commitReviewPlan(w http.ResponseWriter, r *http.Request, effect
|
||||
}
|
||||
s.respondReviewOperation(w, r, op, true)
|
||||
}
|
||||
|
||||
func (s *server) failReviewPlan(r *http.Request, id, message string) {
|
||||
ctx, cancel := context.WithTimeout(context.WithoutCancel(r.Context()), 10*time.Second)
|
||||
defer cancel()
|
||||
current, err := s.store.GetReviewOperation(ctx, id)
|
||||
if err != nil || current == nil || current.Status != "prepared" {
|
||||
return
|
||||
}
|
||||
current.Status, current.Error = "failed_before_effects", message
|
||||
_, _ = s.store.CompareAndSwapReviewOperation(ctx, *current, current.Revision)
|
||||
}
|
||||
func (s *server) respondReviewOperation(w http.ResponseWriter, r *http.Request, op *domain.ReviewOperation, run bool) {
|
||||
if run && op.Status == "applying" {
|
||||
op = s.runReviewOperation(r.Context(), op)
|
||||
@ -359,7 +402,7 @@ func (s *server) applyReviewEffect(ctx context.Context, op *domain.ReviewOperati
|
||||
return nil
|
||||
}
|
||||
}
|
||||
ok, err := s.store.UpdateHumanItemVersioned(ctx, *e.Item, e.BeforeItem.Version)
|
||||
ok, err := s.store.UpdateHumanItemForReview(ctx, *e.Item, e.BeforeItem.Version)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@ -13,8 +13,55 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
)
|
||||
|
||||
// Enforce Mongo's document bound through the actual HTTP decision path.
|
||||
type boundedReviewStore struct {
|
||||
store.Store
|
||||
largest int
|
||||
}
|
||||
|
||||
func (s *boundedReviewStore) CompareAndSwapReviewOperation(ctx context.Context, op domain.ReviewOperation, version int) (bool, error) {
|
||||
b, err := bson.Marshal(op)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if len(b) > s.largest {
|
||||
s.largest = len(b)
|
||||
}
|
||||
if len(b) > 16*1024*1024 {
|
||||
return false, fmt.Errorf("review operation exceeds BSON limit")
|
||||
}
|
||||
return s.Store.CompareAndSwapReviewOperation(ctx, op, version)
|
||||
}
|
||||
func TestReviewDecisionLargeHistoryPreserved(t *testing.T) {
|
||||
f := decisionFixture(t)
|
||||
item, _ := f.store.GetHumanItem(f.ctx, f.item.ID)
|
||||
history := strings.Repeat("h", 7*1024*1024)
|
||||
item.Subject.Payload["sliceResetHistory"] = history
|
||||
f.store.UpsertHumanItem(f.ctx, *item)
|
||||
version, headers := openReviewDraftSession(t, f)
|
||||
wrapped := &boundedReviewStore{Store: f.store}
|
||||
f.handler = NewHandler(wrapped, nil)
|
||||
payload := map[string]any{"stage": "quality", "decision": "rejected", "reasonCodes": []string{"manual_review_reject"}, "problemSliceIds": []string{"left"}, "comment": "fix", "operationId": "large-history", "draftVersion": 0, "resultVersion": version}
|
||||
r := reviewSessionRequest(f, http.MethodPost, "/api/plugins/annotation-qa/tasks/"+f.task.ID+"/reviews", f.reviewer, payload, headers)
|
||||
if r.Code != 201 {
|
||||
t.Fatalf("decision %d %s (largest %d)", r.Code, r.Body.String(), wrapped.largest)
|
||||
}
|
||||
after, _ := f.store.GetHumanItem(f.ctx, f.item.ID)
|
||||
if after.Subject.Payload["sliceResetHistory"] != history {
|
||||
t.Fatal("history changed")
|
||||
}
|
||||
if wrapped.largest > 8*1024*1024 {
|
||||
t.Fatalf("duplicated evidence: %d", wrapped.largest)
|
||||
}
|
||||
if r.Body.Len() > 64*1024 {
|
||||
t.Fatalf("bloated response: %d", r.Body.Len())
|
||||
}
|
||||
}
|
||||
|
||||
func TestReviewDecisionReceiptReplaysAfterQualityTaskLeavesReviewer(t *testing.T) {
|
||||
f := reviewSessionFixture(t)
|
||||
batch, _ := f.store.GetHumanBatch(f.ctx, f.item.BatchID)
|
||||
@ -92,12 +139,12 @@ func (s *interruptedReviewStore) UpdateAnnotationTaskForReview(ctx context.Conte
|
||||
}
|
||||
return s.Store.UpdateAnnotationTaskForReview(ctx, before, next)
|
||||
}
|
||||
func (s *interruptedReviewStore) UpdateHumanItemVersioned(ctx context.Context, next domain.HumanItemRecord, expected int) (bool, error) {
|
||||
func (s *interruptedReviewStore) UpdateHumanItemForReview(ctx context.Context, next domain.HumanItemRecord, expected int) (bool, error) {
|
||||
if s.failure == "before-second-source" && next.ID == "source-b" && !s.fired {
|
||||
s.fired = true
|
||||
return false, fmt.Errorf("injected aggregate source interruption")
|
||||
}
|
||||
ok, e := s.Store.UpdateHumanItemVersioned(ctx, next, expected)
|
||||
ok, e := s.Store.UpdateHumanItemForReview(ctx, next, expected)
|
||||
if s.failure == "after-human-write" && next.ReviewOperationID != "" && ok && e == nil && !s.fired {
|
||||
s.fired = true
|
||||
return false, fmt.Errorf("injected lost human write response")
|
||||
|
||||
@ -85,6 +85,36 @@ func (s *MongoStore) CompareAndSwapReviewOperation(ctx context.Context, v domain
|
||||
return e == nil && r.MatchedCount == 1, e
|
||||
}
|
||||
|
||||
// Review decisions own workflow state, never the customer's annotation/evidence.
|
||||
func humanReviewFields(v domain.HumanItemRecord) bson.M {
|
||||
return bson.M{"currentStageId": v.CurrentStageID, "status": v.Status,
|
||||
"assignedUserId": v.AssignedUserID, "claimedAt": v.ClaimedAt,
|
||||
"reviewRound": v.ReviewRound, "version": v.Version,
|
||||
"acceptedAt": v.AcceptedAt, "acceptedByUserId": v.AcceptedByUserID,
|
||||
"rejectedAt": v.RejectedAt, "updatedAt": v.UpdatedAt,
|
||||
"reviewOperationId": v.ReviewOperationID}
|
||||
}
|
||||
func (s *MongoStore) UpdateHumanItemForReview(ctx context.Context, next domain.HumanItemRecord, expected int) (bool, error) {
|
||||
r, err := s.humanItems.UpdateOne(ctx, bson.M{"id": next.ID, "organizationId": next.OrganizationID, "version": expected}, bson.M{"$set": humanReviewFields(next)})
|
||||
return err == nil && r.MatchedCount == 1, err
|
||||
}
|
||||
func (s *MemoryStore) UpdateHumanItemForReview(_ context.Context, next domain.HumanItemRecord, expected int) (bool, error) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
current, ok := s.humanItems[next.ID]
|
||||
if !ok || current.OrganizationID != next.OrganizationID || current.Version != expected {
|
||||
return false, nil
|
||||
}
|
||||
current.CurrentStageID, current.Status = next.CurrentStageID, next.Status
|
||||
current.AssignedUserID, current.ClaimedAt = next.AssignedUserID, next.ClaimedAt
|
||||
current.ReviewRound, current.Version = next.ReviewRound, next.Version
|
||||
current.AcceptedAt, current.AcceptedByUserID = next.AcceptedAt, next.AcceptedByUserID
|
||||
current.RejectedAt, current.UpdatedAt = next.RejectedAt, next.UpdatedAt
|
||||
current.ReviewOperationID = next.ReviewOperationID
|
||||
s.humanItems[next.ID] = current
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// Only the workflow fields a formal decision owns are changed. A replay cannot
|
||||
// overwrite a newer annotation revision or a later task claim.
|
||||
func (s *MemoryStore) UpdateAnnotationTaskForReview(_ context.Context, before, next domain.AnnotationTaskRecord) (bool, error) {
|
||||
|
||||
58
internal/store/review_decision_patch_test.go
Normal file
58
internal/store/review_decision_patch_test.go
Normal file
@ -0,0 +1,58 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"droboticflow/internal/domain"
|
||||
"fmt"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.mongodb.org/mongo-driver/mongo/options"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func reviewPatchContract(t *testing.T, s Store) {
|
||||
t.Helper()
|
||||
ctx := t.Context()
|
||||
before := domain.HumanItemRecord{ID: "patch-item", OrganizationID: "patch-org", Version: 5, Status: domain.HumanItemClaimed, CurrentStageID: "quality_review", Subject: domain.HumanSubjectRef{ItemKey: "evidence", Payload: map[string]any{"history": "keep", "annotation": "original"}}}
|
||||
if err := s.UpsertHumanItem(ctx, before); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
next := before
|
||||
next.Subject = domain.HumanSubjectRef{}
|
||||
next.Version = 6
|
||||
next.Status = domain.HumanItemSubmitted
|
||||
next.ReviewOperationID = "decision"
|
||||
if ok, e := s.UpdateHumanItemForReview(ctx, next, 4); ok || e != nil {
|
||||
t.Fatalf("stale write: %v %v", ok, e)
|
||||
}
|
||||
if ok, e := s.UpdateHumanItemForReview(ctx, next, 5); !ok || e != nil {
|
||||
t.Fatalf("write: %v %v", ok, e)
|
||||
}
|
||||
got, e := s.GetHumanItem(ctx, before.ID)
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
if got.Subject.Payload["history"] != "keep" || got.Subject.Payload["annotation"] != "original" || got.Version != 6 || got.ReviewOperationID != "decision" {
|
||||
t.Fatal("lost evidence or transition")
|
||||
}
|
||||
if ok, e := s.UpdateHumanItemForReview(ctx, next, 5); ok || e != nil {
|
||||
t.Fatalf("duplicate write: %v %v", ok, e)
|
||||
}
|
||||
}
|
||||
func TestReviewPatchMemory(t *testing.T) { reviewPatchContract(t, NewMemoryStore()) }
|
||||
func TestReviewPatchLocalMongo(t *testing.T) {
|
||||
if os.Getenv("REVIEW_LOCAL_MONGO_TEST") != "1" {
|
||||
t.Skip("local Mongo only")
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
|
||||
defer cancel()
|
||||
c, e := mongo.Connect(ctx, options.Client().ApplyURI("mongodb://127.0.0.1:27018/?directConnection=true").SetServerSelectionTimeout(5*time.Second))
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
defer c.Disconnect(context.Background())
|
||||
db := c.Database(fmt.Sprintf("review_patch_test_%d", time.Now().UnixNano()))
|
||||
defer db.Drop(context.Background())
|
||||
reviewPatchContract(t, NewMongoStore(db))
|
||||
}
|
||||
@ -30,6 +30,7 @@ type Store interface {
|
||||
FindReviewOperation(context.Context, string, string, string, string) (*domain.ReviewOperation, error)
|
||||
CompareAndSwapReviewOperation(context.Context, domain.ReviewOperation, int) (bool, error)
|
||||
UpdateAnnotationTaskForReview(context.Context, domain.AnnotationTaskRecord, domain.AnnotationTaskRecord) (bool, error)
|
||||
UpdateHumanItemForReview(context.Context, domain.HumanItemRecord, int) (bool, error)
|
||||
GetReviewDraft(context.Context, string) (*domain.ReviewDraft, error)
|
||||
CompareAndSwapReviewDraft(context.Context, domain.ReviewDraft, int) (bool, error)
|
||||
GetReviewContinuation(context.Context, string) (*domain.ReviewContinuation, error)
|
||||
|
||||
@ -148,12 +148,20 @@ export function useReviewDecision(
|
||||
setFailureVersion((v) => v + 1);
|
||||
setMessage(cause instanceof Error ? cause.message : "提交结果未知,请核对原提交。");
|
||||
// A transport failure is never evidence that the request had no effect.
|
||||
if (cause instanceof APIError && cause.status >= 400 && cause.status < 500) {
|
||||
if (cause instanceof APIError) {
|
||||
try {
|
||||
await reviewDecisionApi.get(request.itemId, request.operationId);
|
||||
const receipt = await reviewDecisionApi.get(request.itemId, request.operationId);
|
||||
if (key !== keyRef.current) return;
|
||||
if (receipt.status === "completed") finish(request, receipt, key);
|
||||
else if (receipt.status === "failed_before_effects") {
|
||||
writePending(null, key);
|
||||
setMessage(receipt.error || "原提交未产生正式变更,草稿已保留,请重试。");
|
||||
resolver.current?.(null);
|
||||
resolver.current = null;
|
||||
}
|
||||
} catch (readError) {
|
||||
if (key !== keyRef.current) return;
|
||||
if (readError instanceof APIError && readError.status === 404) {
|
||||
if (cause.status >= 400 && cause.status < 500 && readError instanceof APIError && readError.status === 404) {
|
||||
writePending(null, key);
|
||||
resolver.current?.(null);
|
||||
resolver.current = null;
|
||||
|
||||
66
tests/browser/review-decision-failure.mjs
Normal file
66
tests/browser/review-decision-failure.mjs
Normal file
@ -0,0 +1,66 @@
|
||||
// Local-only hook regression: synthetic responses, no customer API calls.
|
||||
import assert from "node:assert/strict";
|
||||
import { createServer } from "vite";
|
||||
import { chromium } from "playwright";
|
||||
|
||||
const server = await createServer({
|
||||
configFile: false,
|
||||
server: { allowedHosts: ["review-errors.test"], host: "127.0.0.1", port: 5197 },
|
||||
plugins: [
|
||||
{
|
||||
name: "review-error-harness",
|
||||
configureServer(server) {
|
||||
server.middlewares.use("/review-error-test", async (_req, res) => {
|
||||
res.setHeader("Content-Type", "text/html");
|
||||
res.end(
|
||||
await server.transformIndexHtml(
|
||||
"/review-error-test",
|
||||
`<div id="root"></div><script type="module">
|
||||
import React from 'react';
|
||||
import {createRoot} from 'react-dom/client';
|
||||
import {useReviewDecision} from '/src/hooks/useReviewDecision.ts';
|
||||
import {reviewDecisionApi} from '/src/services/api/review-decision.ts';
|
||||
import {APIError} from '/src/services/api/client.ts';
|
||||
reviewDecisionApi.send=async()=>{throw new APIError('write failed',window.httpStatus||500,'');};
|
||||
reviewDecisionApi.get=async()=>{if(window.receipt==='unknown')throw new Error('network');return {status:window.receipt,error:'draft retained'};};
|
||||
function App(){window.decision=useReviewDecision('test','project',new URLSearchParams(location.search).get('stage'),()=>{});return React.createElement('div',null,window.decision.message);}
|
||||
createRoot(document.getElementById('root')).render(React.createElement(App));
|
||||
</script>`,
|
||||
),
|
||||
);
|
||||
});
|
||||
},
|
||||
},
|
||||
],
|
||||
optimizeDeps: { noDiscovery: true, entries: [], include: ["react", "react-dom/client"] },
|
||||
});
|
||||
let browser;
|
||||
try {
|
||||
await server.listen();
|
||||
browser = await chromium.launch({
|
||||
executablePath: process.env.BROWSER_PATH || "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
|
||||
headless: true,
|
||||
args: ["--no-proxy-server", "--host-resolver-rules=MAP review-errors.test 127.0.0.1"],
|
||||
});
|
||||
const page = await browser.newPage();
|
||||
page.setDefaultTimeout(15000);
|
||||
page.on("pageerror", (error) => console.error(error.message));
|
||||
const base = server.resolvedUrls.local[0].replace("127.0.0.1", "review-errors.test");
|
||||
for (const stage of ["quality", "acceptance"]) {
|
||||
await page.goto(base + "review-error-test?stage=" + stage);
|
||||
await page.waitForFunction(() => window.decision);
|
||||
for (const [httpStatus,receipt] of [[500,'failed_before_effects'],[409,'failed_before_effects'],[500,'completed'],[500,'unknown']]) {
|
||||
await page.evaluate(({httpStatus,receipt})=>{window.httpStatus=httpStatus;window.receipt=receipt;void window.decision.request({itemId:'test-item',path:'/test',payload:{},title:'test',decision:'rejected',scopeText:'test'},()=>({}));},{httpStatus,receipt});
|
||||
await page.waitForFunction(()=>window.decision.confirmation);
|
||||
await page.evaluate(()=>window.decision.confirm());
|
||||
await page.waitForFunction(()=>!window.decision.busy&&!window.decision.confirmation);
|
||||
assert.equal(await page.evaluate(()=>Boolean(window.decision.pending)),receipt==='unknown');
|
||||
assert.equal(await page.evaluate(()=>Object.keys(localStorage).some(k=>k.startsWith('review-decision:'))),receipt==='unknown');
|
||||
}
|
||||
await page.evaluate(()=>localStorage.clear());
|
||||
console.log('PASS',stage,'500/409 terminal failure unlock, completed receipt, unknown remains protected');
|
||||
}
|
||||
} finally {
|
||||
await browser?.close();
|
||||
await server.close();
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user