Repository navigation
修复 macOS 内存压力误判:改读内核压力等级 #627
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
Open
imcco
wants to merge
2
commits into
aimod-cc:beta
Choose a base branch
from
imcco:fix/macos-memory-pressure
base: beta
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.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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.
保留零限额的内存压力原因
仅有内存压力时,
effective()会将图片和后台限额设为 0。block_reason()随后返回ConcurrencyLimit,因此拒绝计数和 HTTP 响应无法区分内存压力与普通并发满额。请在这些类因内存压力被设为零限额时返回
MemoryPressure,同时保留对话类的现有准入行为。这样可以让调用方和运维人员看到实际原因。路径规范要求关注“错误提示”与“异常边界问题”。Source: Path instructions
进程或容器占用达到总内存 4/5 时,对话和交互请求仍会被放行。
block_reason现在只在 CPU 压力下拦截后台和图片类请求。内存压力只把background和images限额设为 0(mod.rs:96、mod.rs:100)。memory_pressure仍包含container_bytes(或process_bytes)>= process_ceiling的判断(mod.rs:88),但它不再拦截Request、Conversation和Interactive。MemoryBudget::grow只比较应用自己记账的字节数与limits.memory_bytes(memory.rs:52)。它不读取进程或容器的实际占用。process_ceiling在整个服务端目录中只出现在mod.rs:80和mod.rs:88,没有其他位置执行该上限。因此,进程或容器占用超过 4/5 总内存时,只要并发名额未满,这三类请求仍会被接收。PR 目标要求保留该硬上限,当前实现与此不符。
修复方向:在
block_reason中单独检查进程或容器占用是否达到process_ceiling。达到时,拒绝这三类请求,并使用与内核压力等级不同的拒绝原因。内核压力等级的修复保持不变。测试memory_pressure_must_not_block_chat_requests只覆盖内核压力标志,应补充进程或容器超过上限的用例。