mirrors/nodejs
mirrors/nodejs
0
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-28 22:46:31 +01:00
Code Issues Releases Activity

fs: fixes recursive fs.watch crash on Linux when deleting files

Browse Source 
Signed-off-by: Matteo Collina <hello@matteocollina.com>
Fixes: https://github.com/nodejs/node/issues/52018
PR-URL: https://github.com/nodejs/node/pull/52349
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
This commit is contained in:
Matteo Collina 2024-04-19 14:52:14 +02:00 committed by GitHub
parent 580aae58f6
commit d3eb1cb385
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/internal/fs/recursive_watch.js
View File

@ -157,11 +157,16 @@ class FSWatcher extends EventEmitter {
persistent: this.#options.persistent, persistent: this.#options.persistent,
}, (eventType, filename) => { }, (eventType, filename) => {
const existingStat = this.#files.get(file); const existingStat = this.#files.get(file);
const currentStats = statSync(file); let currentStats;
this.#files.set(file, currentStats); try {
currentStats = statSync(file);
this.#files.set(file, currentStats);
} catch {
// This happens if the file was removed
}
if (currentStats.birthtimeMs === 0 && existingStat.birthtimeMs !== 0) { if (currentStats === undefined || (currentStats.birthtimeMs === 0 && existingStat.birthtimeMs !== 0)) {
// The file is now deleted // The file is now deleted
this.#files.delete(file); this.#files.delete(file);
this.#watchers.delete(file); this.#watchers.delete(file);

30
test/parallel/test-fs-watch-recursive-delete.js Normal file
View File

@ -0,0 +1,30 @@
'use strict';
const common = require('../common');
const tmpdir = require('../common/tmpdir');
const fs = require('fs');
if (common.isSunOS)
common.skip('SunOS behaves differently');
tmpdir.refresh();
fs.mkdirSync(tmpdir.resolve('./parent/child'), { recursive: true });
fs.writeFileSync(tmpdir.resolve('./parent/child/test.tmp'), 'test');
const toWatch = tmpdir.resolve('./parent');
const onFileUpdate = common.mustCallAtLeast((eventType, filename) => {
// We are only checking for the filename to avoid having Windows, Linux and Mac specific assertions
if (fs.readdirSync(tmpdir.resolve('./parent')).length === 0) {
watcher.close();
}
}, 1);
const watcher = fs.watch(toWatch, { recursive: true }, onFileUpdate);
// We must wait a bit `fs.rm()` to let the watcher be set up properly
setTimeout(() => {
fs.rm(tmpdir.resolve('./parent/child'), { recursive: true }, common.mustCall());
}, common.platformTimeout(500));