Skip to content

fix(delete): 统一「D1 删成功 = 业务成功」,R2 清理失败留孤儿 - #13

Merged
leeefun merged 1 commit into
masterfrom
fix/delete-success-semantics
Oct 7, 2026
Merged

leeefun merged 1 commit into
masterfrom
fix/delete-success-semantics

Conversation

@leeefun

@leeefun leeefun commented Oct 6, 2026

Copy link
Copy Markdown
Owner

问题

删除的顺序是"先 D1 删行、后 R2 清数据目录"(这个顺序必须保留——反过来一旦 DELETE 失败就是整库悬空)。但后半段的 R2 清理失败会把一次已经生效的删除变成 500:用户看到失败、数据其实没了、重试也删不掉(行已不在),只会误导。

改动

统一语义:D1 完成永久删除 = 业务删除成功;随后 R2 清理失败 = 留下 orphan,由 Cron 的孤儿阶段回收,同时打可观测日志。

  • src/historyOps.ts:deleteRecordsWorkingDirs 改 best-effort,内部 catch 后 console.warn('[cleanup] deferred R2 cleanup', …);clearAllHistory / purgeTrash 照常返回删除条数。
  • src/ui/routes.ts:batch-purge 单条 R2 删失败不再把整批变 500(D1 删成功计入 purged)。
  • D1 删除失败仍然必须失败,没有吞。
  • docs/design.md §6 登记该成功语义。

未引入 D1/R2 两阶段提交或事务模拟。

验证

test/fixes.test.ts 注入 Bucket.delete 抛错:

  • purgeTrash / clearAllHistory 仍返回删除条数,且行确实已删;
  • 阳性对照:无故障时字节确实被清掉。

tsc/eslint 干净;全量套件 22/22 通过。

删除顺序仍是先 D1 后 R2(反转一旦失败就是整库悬空),改的是后半段的错误处理:
此前 R2 清理抛错会让已经删掉行的请求变成 500 —— 用户看到失败、数据其实没了,
重试也删不掉(行已不在),只会误导。

- src/historyOps.ts:deleteRecordsWorkingDirs 改 best-effort,内部 catch 后
  打 '[cleanup] deferred R2 cleanup' 日志;clearAllHistory/purgeTrash 照常返回条数。
- src/ui/routes.ts:batch-purge 单条 R2 删失败不再把整批变 500(D1 删成功计入 purged,
  目录失败只留日志,由孤儿阶段兜底)。
- test/fixes.test.ts:注入 Bucket.delete 抛错,验证 purgeTrash/clearAllHistory 仍返回
  删除条数且行确实已删;阳性对照证明无故障时字节确实被清。
- docs/design.md §6:登记删除的成功语义。
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 6, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-06T15:03:37.262272Z add5aa3 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

leeefun added a commit that referenced this pull request Oct 6, 2026
评审指出:#16 基于旧 master,其 historyOps.ts / routes(移动后) 仍是裸的
deleteHistoryWorkingDir,没有 #13 的 best-effort 语义 ⇒ 若 #16 先合会退掉 #13。

本提交把 #13 的改动原样前向移植(使 #16 rebase 时无实质冲突):
- src/historyOps.ts:deleteRecordsWorkingDirs 改 best-effort(catch + '[cleanup] deferred R2 cleanup')。
- src/ui/routes/history-mutations.ts:batch-purge 单条 R2 删失败不再把整批变 500。
- test/fixes.test.ts:FakeBucket.failDelete 注入 + 三条用例(purgeTrash/clearAllHistory/阳性对照)。
- docs/design.md §6:登记删除成功语义。
@leeefun
leeefun merged commit e35110e into master Oct 7, 2026
1 check passed
@leeefun
leeefun deleted the fix/delete-success-semantics branch October 7, 2026 00:24
leeefun added a commit that referenced this pull request Oct 7, 2026
评审指出:#16 基于旧 master,其 historyOps.ts / routes(移动后) 仍是裸的
deleteHistoryWorkingDir,没有 #13 的 best-effort 语义 ⇒ 若 #16 先合会退掉 #13。

本提交把 #13 的改动原样前向移植(使 #16 rebase 时无实质冲突):
- src/historyOps.ts:deleteRecordsWorkingDirs 改 best-effort(catch + '[cleanup] deferred R2 cleanup')。
- src/ui/routes/history-mutations.ts:batch-purge 单条 R2 删失败不再把整批变 500。
- test/fixes.test.ts:FakeBucket.failDelete 注入 + 三条用例(purgeTrash/clearAllHistory/阳性对照)。
- docs/design.md §6:登记删除成功语义。
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant