Repository navigation
fix: poll directories the system has no watcher left for, instead of reporting their files as removed #359
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
Merged
+126
−0
Merged
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "watchpack": patch | ||
| --- | ||
|
|
||
| When the system runs out of file watchers (`ENOSPC`/`EMFILE`, e.g. `fs.inotify.max_user_watches` on Linux), poll the directories it cannot watch instead of reporting their files as removed and retrying in a loop, and log the error once with a hint (fixes #46). |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| "use strict"; | ||
|
|
||
| const fs = require("fs"); | ||
| const path = require("path"); | ||
| const Watchpack = require("../lib"); | ||
| const TestHelper = require("./helpers/TestHelper"); | ||
|
|
||
| const fixtures = path.join(__dirname, "fixtures"); | ||
| const testHelper = new TestHelper(fixtures); | ||
|
|
||
| // eslint-disable-next-line jest/no-confusing-set-timeout | ||
| jest.setTimeout(20000); | ||
|
|
||
| describe("Watcher limit of the system (#46)", () => { | ||
| beforeEach((done) => { | ||
| testHelper.before(done); | ||
| }); | ||
|
|
||
| /** @type {InstanceType<typeof Watchpack>[]} */ | ||
| let watchers = []; | ||
|
|
||
| afterEach((done) => { | ||
| // closed here, not in the test, so a failure cannot leave one running | ||
| for (const w of watchers) w.close(); | ||
| watchers = []; | ||
| jest.restoreAllMocks(); | ||
| testHelper.after(done); | ||
| }); | ||
|
|
||
| it("should poll a directory it cannot watch instead of reporting its files as removed", (done) => { | ||
| const dir = path.join(fixtures, "dir"); | ||
| const file = path.join(dir, "a"); | ||
| testHelper.dir("dir"); | ||
| testHelper.file(path.join("dir", "a")); | ||
| const { watch } = fs; | ||
| let watchCalls = 0; | ||
| jest.spyOn(fs, "watch").mockImplementation((target, ...args) => { | ||
| if (target === dir) { | ||
| watchCalls++; | ||
| throw Object.assign( | ||
| new Error( | ||
| `ENOSPC: System limit for number of file watchers reached, watch '${dir}'`, | ||
| ), | ||
| { code: "ENOSPC" }, | ||
| ); | ||
| } | ||
| return /** @type {(...a: unknown[]) => fs.FSWatcher} */ (watch)( | ||
| target, | ||
| ...args, | ||
| ); | ||
| }); | ||
| const errors = jest.spyOn(console, "error").mockImplementation(() => {}); | ||
| testHelper.tick(1000, () => { | ||
| const w = new Watchpack({ aggregateTimeout: 100 }); | ||
| watchers.push(w); | ||
| /** @type {string[]} */ | ||
| const removed = []; | ||
| w.on("remove", (item) => { | ||
| removed.push(item); | ||
| }); | ||
| let edited = false; | ||
| w.on("change", (item) => { | ||
| // coarse timestamps can report the file in the initial scan | ||
| if (!edited) return; | ||
| expect(item).toBe(file); | ||
| expect(removed).toEqual([]); | ||
| // tried once, not again and again | ||
| expect(watchCalls).toBeLessThanOrEqual(1); | ||
| expect( | ||
| errors.mock.calls.filter((call) => /ENOSPC/.test(String(call[0]))), | ||
| ).toHaveLength(watchCalls); | ||
| done(); | ||
| }); | ||
| w.watch({ files: [file], startTime: Date.now() }); | ||
| testHelper.tick(1000, () => { | ||
| edited = true; | ||
| testHelper.file(path.join("dir", "a")); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.