Skip to content

fix(watch): skip unreadable directories instead of failing the watch - #13992

Merged
ndeloof merged 2 commits into
docker:mainfrom
Endika:fix/watch-unreadable-directory
Aug 11, 2026
Merged

ndeloof merged 2 commits into
docker:mainfrom
Endika:fix/watch-unreadable-directory

Conversation

@Endika

@Endika Endika commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

What I did

compose watch registers an inotify watch on every directory below the watched
path. A single directory the current user cannot read makes registration fail
with permission denied, and the whole watch fails to start β€” so nothing gets
watched at all.

Permission errors are now treated the way the surrounding code already treats
os.IsNotExist: log at debug level and filepath.SkipDir. Losing visibility
into one subtree should not cost the entire watch.

Includes a regression test in watcher_naive_test.go, which fails without the
change.

Related issue

closes #13750

domesticated-upset-golden-retriever-looking-out-window-missing-his-owner by https://www.magnific.com/

@Endika
Endika requested review from a team as code owners July 31, 2026 17:45
@Endika
Endika requested review from glours and ndeloof July 31, 2026 17:45
@Endika
Endika force-pushed the fix/watch-unreadable-directory branch from eacf003 to e72f36a Compare August 1, 2026 07:47
@codecov

codecov Bot commented Aug 1, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 89.58333% with 5 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
pkg/watch/watcher_naive.go 89.58% 3 Missing and 2 partials ⚠️

πŸ“’ Thoughts on this report? Let us know!

@Endika
Endika force-pushed the fix/watch-unreadable-directory branch 2 times, most recently from 7900d4b to 31835d3 Compare August 3, 2026 17:27
Endika added 2 commits August 5, 2026 09:43
Signed-off-by: Endika Iglesias <endika2@gmail.com>
CI runs the tests as root, where the unreadable-directory test is always
skipped. Extract the WalkDir callbacks and inject the watch registration
so a synthetic permission error can drive those branches instead.

Signed-off-by: Endika Iglesias <endika2@gmail.com>
@Endika
Endika force-pushed the fix/watch-unreadable-directory branch from 31835d3 to d5e70df Compare August 5, 2026 07:52
@ndeloof
ndeloof merged commit 832673c into docker:main Aug 11, 2026
44 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 19, 2026
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker/compose](https://github.com/docker/compose) | minor | `v5.4.0` β†’ `v5.5.0` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>docker/compose (docker/compose)</summary>

### [`v5.5.0`](https://github.com/docker/compose/releases/tag/v5.5.0)

[Compare Source](docker/compose@v5.4.0...v5.5.0)

#### What's Changed

> ℹ️  This release overhauls image digest reconciliation to prevent unnecessary container recreation.\
> Existing containers may be recreated the first time you run `compose up` after upgrading, as image digests are re-evaluated using the new logic.
>
> `compose pull` now honors `pull_policy` refresh windows (`daily`, `weekly`, `every_N`).

##### ✨ Improvements

- New image digest reconciliation process by [@&#8203;glours](https://github.com/glours) & [@&#8203;ndeloof](https://github.com/ndeloof) [#&#8203;14011](docker/compose#14011) [#&#8203;14041](docker/compose#14041)

##### πŸ› Fixes

- Fix(bridge): skip pulling default image references for build-only ser… by [@&#8203;ericwyles](https://github.com/ericwyles) in [#&#8203;14010](docker/compose#14010)
- Fix(watch): stop pruning every dangling image of the project by [@&#8203;glours](https://github.com/glours) in [#&#8203;14012](docker/compose#14012)
- Fix(config): resolve service environment when computing --hash by [@&#8203;glours](https://github.com/glours) in [#&#8203;14002](docker/compose#14002)
- Fix(watch): skip unreadable directories instead of failing the watch by [@&#8203;Endika](https://github.com/Endika) in [#&#8203;13992](docker/compose#13992)
- Fix: ignore one-off container events in up monitor by [@&#8203;brano-osif](https://github.com/brano-osif) in [#&#8203;14038](docker/compose#14038)
- Fix(bridge): validate arguments of bridge subcommands by [@&#8203;glours](https://github.com/glours) in [#&#8203;14003](docker/compose#14003)
- Fix(images): tolerate containers whose image record is gone by [@&#8203;ndeloof](https://github.com/ndeloof) in [#&#8203;14028](docker/compose#14028)

##### πŸ”§  Internal

- Test: Set stop\_signal to SIGTERM in nginx-based services by [@&#8203;ricardobranco777](https://github.com/ricardobranco777) in [#&#8203;13881](docker/compose#13881)
- Chore: inline needlessly extracted single-use helpers by [@&#8203;ndeloof](https://github.com/ndeloof) in [#&#8203;14048](docker/compose#14048)
- Add ENGINE column driven by label by [@&#8203;nicksieger](https://github.com/nicksieger) in [#&#8203;13959](docker/compose#13959)

##### βš™οΈ Dependencies

- Build(deps): bump github.com/moby/moby/client from 0.5.0 to 0.5.1 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;13999](docker/compose#13999)
- Build(deps): bump github/codeql-action/upload-sarif from 4.37.3 to 4.37.4 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14009](docker/compose#14009)
- Build(deps): bump github/codeql-action/upload-sarif from 4.37.4 to 4.37.5 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14019](docker/compose#14019)
- Build(deps): bump github.com/moby/buildkit from 0.32.1 to 0.32.2 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14033](docker/compose#14033)
- Build(deps): bump github.com/docker/buildx from 0.36.0 to 0.36.1 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14034](docker/compose#14034)
- Build(deps): bump docker/github-builder/.github/workflows/bake.yml from 1.15.0 to 1.16.0 in the docker-actions group by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14035](docker/compose#14035)
- Build(deps): bump github.com/moby/go-archive from 0.3.2 to 0.3.3 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14043](docker/compose#14043)
- Build(deps): bump github/codeql-action/upload-sarif from 4.37.5 to 4.37.6 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14022](docker/compose#14022)
- Build(deps): bump github.com/docker/cli from 29.6.2+incompatible to 29.7.2+incompatible by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14042](docker/compose#14042)
- Build(deps): bump google.golang.org/grpc from 1.82.1 to 1.83.0 by [@&#8203;dependabot](https://github.com/dependabot)\[bot] in [#&#8203;14008](docker/compose#14008)
- Bump golang to version 1.26.6 by [@&#8203;glours](https://github.com/glours) in [#&#8203;14045](docker/compose#14045)

#### New Contributors

- [@&#8203;ericwyles](https://github.com/ericwyles) made their first contribution in [#&#8203;14010](docker/compose#14010)
- [@&#8203;Endika](https://github.com/Endika) made their first contribution in [#&#8203;13992](docker/compose#13992)
- [@&#8203;brano-osif](https://github.com/brano-osif) made their first contribution in [#&#8203;14038](docker/compose#14038)

**Full Changelog**: <docker/compose@v5.4.0...v5.5.0>

</details>

---

### Configuration

πŸ“… **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

β™» **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

πŸ”• **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yODguMCIsInVwZGF0ZWRJblZlciI6IjQzLjI4OC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiLCJhdXRvbWF0aW9uOmJvdC1hdXRob3JlZCIsImRlcGVuZGVuY3ktdHlwZTo6bWlub3IiXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] watch tries to read ignored folders leading to permission denied

2 participants