Skip to content

fs: Don't treat watcher errors as reason to do rescans - #56165

Merged
probably-neb merged 1 commit into
mainfrom
push-lzwvxnxoryzk
May 8, 2026
Merged

fs: Don't treat watcher errors as reason to do rescans#56165
probably-neb merged 1 commit into
mainfrom
push-lzwvxnxoryzk

Conversation

@probably-neb

@probably-neb probably-neb commented May 8, 2026

Copy link
Copy Markdown
Collaborator

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • 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 cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 8, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label May 8, 2026
@probably-neb
probably-neb added this pull request to the merge queue May 8, 2026
Merged via the queue into main with commit f87f0c0 May 8, 2026
46 checks passed
@probably-neb
probably-neb deleted the push-lzwvxnxoryzk branch May 8, 2026 13:21
@probably-neb

Copy link
Copy Markdown
Collaborator Author

/cherry-pick preview
/cherry-pick stable

probably-neb added a commit that referenced this pull request May 8, 2026
…ry-pick to preview) (#56174)

Cherry-pick of #56165 to preview

----
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

Co-authored-by: Ben Kunkle <ben@zed.dev>
probably-neb added a commit that referenced this pull request May 8, 2026
…ry-pick to stable) (#56175)

Cherry-pick of #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 #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

Co-authored-by: Ben Kunkle <ben@zed.dev>
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>
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
…s#56165)

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
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
…s#56165)

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

FS polling watcher excessive cpu usage on remote workspace

2 participants