fs: Don't treat watcher errors as reason to do rescans (#56165) (cherry-pick to stable) - #56175
Merged
Merged
Conversation
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 is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes #56064 This behavior regressed in #54481 Release Notes: - Fixed an issue where broken symlinks, permission errors, or other fs errors in watched directories could cause excessive CPU usage
cla-bot
Bot
added
the
cla-signed
Veykril
approved these changes
May 8, 2026
probably-neb
enabled auto-merge (squash)
May 8, 2026 13:45
13 tasks
This was referenced May 11, 2026
Nkr1shna
pushed a commit
to neozed-industries/neo-zed
that referenced
this pull request
May 11, 2026
…s#56165) (cherry-pick to stable) (zed-industries#56175) Cherry-pick of zed-industries#56165 to stable ---- 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 is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#56064 This behavior regressed in zed-industries#54481 Release Notes: - Fixed an issue where broken symlinks, permission errors, or other fs errors in watched directories could cause excessive CPU usage Co-authored-by: Ben Kunkle <ben@zed.dev>
Nkr1shna
pushed a commit
to neozed-industries/neo-zed
that referenced
this pull request
May 13, 2026
…s#56165) (cherry-pick to stable) (zed-industries#56175) Cherry-pick of zed-industries#56165 to stable ---- 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 is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Closes zed-industries#56064 This behavior regressed in zed-industries#54481 Release Notes: - Fixed an issue where broken symlinks, permission errors, or other fs errors in watched directories could cause excessive CPU usage Co-authored-by: Ben Kunkle <ben@zed.dev>
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
2 participants
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.
Cherry-pick of #56165 to stable
Self-Review Checklist:
checklist
Closes #56064
This behavior regressed in
#54481
Release Notes:
errors in watched directories could cause excessive CPU usage