Repository navigation
fix(vm): Docker 在线扩容 cgroup 校验与失败回滚 - #623
Merged
Merged
Conversation
1 of 3 tasks
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
Bot
force-pushed
the
cursor/docker-memory-verify-c713
branch
2 times, most recently
from
October 20, 2026 04:51
5edd770 to
166f0a1
Compare
Co-authored-by: ted <kuhlmangarry24@gmail.com>
Co-authored-by: ted <kuhlmangarry24@gmail.com>
Co-authored-by: ted <kuhlmangarry24@gmail.com>
cursor
Bot
force-pushed
the
cursor/docker-memory-verify-c713
branch
from
October 20, 2026 04:53
166f0a1 to
7da669e
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
从 #621 拆出的独立 PR(REQ-0441 / 在线内存扩容校验),含 release review 要求的加固。
变更
docker update后校验 HostConfig memory + memory-swap;可读 cgroup 时核对限额。memory.max,缺失/不可读时尝试 v1memory/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、回滚。说明
关联
Note
Medium Risk
改动作用于运行中 Docker 槽的
docker update与 vm 配置写入路径;失败回滚依赖 Docker 与 cgroup 读回,回滚失败时需人工核对容器限额。Reviewed by Cursor Bugbot for commit e5eb79b. Configure here.