Skip to content

fix(vm): Docker 在线扩容 cgroup 校验与失败回滚 - #623

Merged
dofastted merged 3 commits into
mainfrom
cursor/docker-memory-verify-c713
Oct 20, 2026
Merged

dofastted merged 3 commits into
mainfrom
cursor/docker-memory-verify-c713

Conversation

@dofastted

@dofastted dofastted commented Oct 20, 2026 •

Copy link
Copy Markdown
Owner

从 #621 拆出的独立 PR(REQ-0441 / 在线内存扩容校验),含 release review 要求的加固。

变更

  • docker update 后校验 HostConfig memory + memory-swap;可读 cgroup 时核对限额。
  • cgroup v2 memory.max,缺失/不可读时尝试 v1 memory/memory.limit_in_bytes;max 或 v1 无上限哨兵在 HostConfig 已匹配时跳过 cgroup 核对(避免 cgroup v1 宿主误报 502)。
  • 任一扩容后校验失败:docker update 回滚至 before 限额,不写 vm 配置;API 返回 rollback_succeeded / config_unchanged 及中文说明。
  • docs/DEPLOY.md 文档化上述行为;单测覆盖 v1、memory.max=max、回滚。

说明

关联

Open in Web Open in Cursor 

Note

Medium Risk
改动作用于运行中 Docker 槽的 docker update 与 vm 配置写入路径;失败回滚依赖 Docker 与 cgroup 读回,回滚失败时需人工核对容器限额。

Reviewed by Cursor Bugbot for commit e5eb79b. Configure here.

cursor Bot pushed a commit that referenced this pull request Oct 20, 2026
Co-authored-by: ted <kuhlmangarry24@gmail.com>
cursor Bot pushed a commit that referenced this pull request Oct 20, 2026
Co-authored-by: ted <kuhlmangarry24@gmail.com>
@cursor
cursor Bot force-pushed the cursor/docker-memory-verify-c713 branch 2 times, most recently from 5edd770 to 166f0a1 Compare October 20, 2026 04:51
cursoragent and others added 3 commits October 20, 2026 04:52
Co-authored-by: ted <kuhlmangarry24@gmail.com>
Co-authored-by: ted <kuhlmangarry24@gmail.com>
@cursor
cursor Bot force-pushed the cursor/docker-memory-verify-c713 branch from 166f0a1 to 7da669e Compare October 20, 2026 04:53
@dofastted
dofastted merged commit 60f6335 into main Oct 20, 2026
7 checks passed
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.

2 participants