Repository navigation
fix(topic-memory): add durable block inspection and recovery #1966
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
knqiufan
wants to merge
6
commits into
oceanbase:master
Choose a base branch
from
knqiufan:codex/fix-topic-memory-block-recovery-1885
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,627
−85
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
501f02b
fix(topic-memory): add durable block inspection and recovery
knqiufan 9ed6b80
fix(ci): sync recovery integrations and acceptance setup
knqiufan 8e8b9c6
fix(topic-memory): preserve worker timeout diagnostics
knqiufan 4e7b77f
fix(topic-memory): retain the selected attempt range
knqiufan 83c2142
docs(topic-memory): clarify legacy range diagnostics
knqiufan 4cdf119
test(topic-memory): wait for exhausted timeout frontier
knqiufan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[P2] 与当前 master 的冲突解决指引(DIRTY 状态)
本 PR 相对 base
666b043a的桌面契约清单是一致的:headopenapi/powercontext.yaml(LF 归一化)sha256 =5e0de479...,与签入的两处清单一致,已独立复算。master 自 merge-base 以来的变化里与本 PR 相交的只有三处:operations.json/operations.ts的 SHA 行(#1988 已把 master 侧刷成c4571e4b)和desktop/scripts/generate.mjs——后者只是把漂移报错文案改成带修复命令,wanted 操作集没有变化。因此:
openapi/powercontext.yaml是纯增量(+158),与 master 合并后摘要仍为5e0de479...;5e0de479...(master 侧的c4571e4b是旧契约),无需重新生成;api.d.ts与_generated/*.pymaster 侧未动,会自动合并;node desktop/scripts/generate.mjs --check终验。其余核对结论:
topic_memory_recovery.py的锁序、租约甄别( MySQL repeatable-read 下加锁重读)、retried_at幂等回放、stale 冲突拒绝均成立;e2e-harness 的 OB datafile 配置带 30 次自校验门控,配错会显式失败,无静默风险。本机 71 个相关测试通过(SQLite 路径)。There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
感谢详细核对。已 rebase 到最新 master,保留合并后契约的
5e0de479…摘要;两处清单一致,node desktop/scripts/generate.mjs --check已通过。