lsp: Bound the incoming language server message queue - #58867
Merged
Conversation
probably-neb
approved these changes
Jun 8, 2026
probably-neb
approved these changes
Jun 8, 2026
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…#58867) The background task reading a language server's stdout pushed every parsed message into an unbounded channel consumed on the foreground thread. If the main thread stalled while a server kept emitting notifications, messages accumulated at wire speed with no limit — matching the report in zed-industries#58190 of 391 GB of memory growth during a multi-hour hang with a chatty server. This bounds the queue at 128 messages. When full, the reader stops reading the server's stdout, so the OS pipe applies back pressure to the server instead of Zed buffering its output in memory. No messages are dropped, and healthy operation is unaffected. In flight client requests behind a full queue fail via their existing background executor timeouts. Adds a regression test that wedges the consumer, asserts the queue stays bounded, then drains it and asserts no messages were lost. Helps with zed-industries#58190 and may also help with zed-industries#31461. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - lsp: Improve Zed's memory usage when LSP's emitted messages faster than the foreground thread can handle them
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…#58867) The background task reading a language server's stdout pushed every parsed message into an unbounded channel consumed on the foreground thread. If the main thread stalled while a server kept emitting notifications, messages accumulated at wire speed with no limit — matching the report in zed-industries#58190 of 391 GB of memory growth during a multi-hour hang with a chatty server. This bounds the queue at 128 messages. When full, the reader stops reading the server's stdout, so the OS pipe applies back pressure to the server instead of Zed buffering its output in memory. No messages are dropped, and healthy operation is unaffected. In flight client requests behind a full queue fail via their existing background executor timeouts. Adds a regression test that wedges the consumer, asserts the queue stays bounded, then drains it and asserts no messages were lost. Helps with zed-industries#58190 and may also help with zed-industries#31461. Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - lsp: Improve Zed's memory usage when LSP's emitted messages faster than the foreground thread can handle them
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.
The background task reading a language server's stdout pushed every parsed message into an unbounded channel consumed on the foreground thread. If the main thread stalled while a server kept emitting notifications, messages accumulated at wire speed with no limit — matching the report in #58190 of 391 GB of memory growth during a multi-hour hang with a chatty server.
This bounds the queue at 128 messages. When full, the reader stops reading the server's stdout, so the OS pipe applies back pressure to the server instead of Zed buffering its output in memory. No messages are dropped, and healthy operation is unaffected. In flight client requests behind a full queue fail via their existing background executor timeouts.
Adds a regression test that wedges the consumer, asserts the queue stays bounded, then drains it and asserts no messages were lost.
Helps with #58190 and may also help with #31461.
Self-Review Checklist:
Release Notes: