fs: do not crash if the watched file is removed while setting up watch #53452

mcollina · 2024-06-14T13:42:28Z

Fixes #53350

Signed-off-by: Matteo Collina <hello@matteocollina.com>

nodejs-github-bot · 2024-06-14T13:55:15Z

CI: https://ci.nodejs.org/job/node-test-pull-request/59785/

MoLow

LGTM

lib/internal/fs/recursive_watch.js

test/parallel/test-fs-watch-recursive-linux-parallel-remove.js

Co-authored-by: Luigi Pinca <luigipinca@gmail.com>

nodejs-github-bot · 2024-06-15T05:42:47Z

CI: https://ci.nodejs.org/job/node-test-pull-request/59793/

nodejs-github-bot · 2024-06-17T13:08:48Z

Commit Queue failed

- Loading data for nodejs/node/pull/53452 ✔ Done loading data for nodejs/node/pull/53452 ----------------------------------- PR info ------------------------------------ Title fs: do not crash if the watched file is removed while setting up watch (#53452) Author Matteo Collina (@mcollina) Branch mcollina:fix-linux-watch -> nodejs:main Labels fs, needs-ci Commits 3 - fs: do not crash if the watched file is removed while setting up watch - fixup - Update test-fs-watch-recursive-linux-parallel-remove.js Committers 2 - Matteo Collina - GitHub PR-URL: https://github.com/nodejs/node/pull/53452 Reviewed-By: James M Snell Reviewed-By: Moshe Atlow Reviewed-By: Marco Ippolito Reviewed-By: Chemi Atlow Reviewed-By: Luigi Pinca Reviewed-By: Yagiz Nizipli ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/53452 Reviewed-By: James M Snell Reviewed-By: Moshe Atlow Reviewed-By: Marco Ippolito Reviewed-By: Chemi Atlow Reviewed-By: Luigi Pinca Reviewed-By: Yagiz Nizipli -------------------------------------------------------------------------------- ℹ This PR was created on Fri, 14 Jun 2024 13:42:28 GMT ✔ Approvals: 6 ✔ - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/53452#pullrequestreview-2118488973 ✔ - Moshe Atlow (@MoLow) (TSC): https://github.com/nodejs/node/pull/53452#pullrequestreview-2118497686 ✔ - Marco Ippolito (@marco-ippolito) (TSC): https://github.com/nodejs/node/pull/53452#pullrequestreview-2118499513 ✔ - Chemi Atlow (@atlowChemi): https://github.com/nodejs/node/pull/53452#pullrequestreview-2118689064 ✔ - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/53452#pullrequestreview-2119052228 ✔ - Yagiz Nizipli (@anonrig): https://github.com/nodejs/node/pull/53452#pullrequestreview-2122841230 ✔ Last GitHub CI successful ℹ Last Full PR CI on 2024-06-15T05:42:47Z: https://ci.nodejs.org/job/node-test-pull-request/59793/ - Querying data for job/node-test-pull-request/59793/ ✔ Last Jenkins CI successful -------------------------------------------------------------------------------- ✔ No git cherry-pick in progress ✔ No git am in progress ✔ No git rebase in progress -------------------------------------------------------------------------------- - Bringing origin/main up to date... From https://github.com/nodejs/node * branch main -> FETCH_HEAD ✔ origin/main is now up-to-date - Downloading patch for 53452 From https://github.com/nodejs/node * branch refs/pull/53452/merge -> FETCH_HEAD ✔ Fetched commits as 2333573f3907..97c7652629e3 -------------------------------------------------------------------------------- [main d44669170f] fs: do not crash if the watched file is removed while setting up watch Author: Matteo Collina Date: Fri Jun 14 15:41:53 2024 +0200 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 test/parallel/test-fs-watch-recursive-linux-parallel-remove.js [main 203dad7f8a] fixup Author: Matteo Collina Date: Fri Jun 14 15:50:44 2024 +0200 2 files changed, 10 insertions(+), 9 deletions(-) [main 60adf9275d] Update test-fs-watch-recursive-linux-parallel-remove.js Author: Matteo Collina Date: Sat Jun 15 07:38:45 2024 +0200 1 file changed, 1 insertion(+), 1 deletion(-) ✔ Patches applied There are 3 commits in the PR. Attempting autorebase. Rebasing (2/6)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
fs: do not crash if the watched file is removed while setting up watch

Signed-off-by: Matteo Collina hello@matteocollina.com
PR-URL: #53452
Reviewed-By: James M Snell jasnell@gmail.com
Reviewed-By: Moshe Atlow moshe@atlow.co.il
Reviewed-By: Marco Ippolito marcoippolito54@gmail.com
Reviewed-By: Chemi Atlow chemi@atlow.co.il
Reviewed-By: Luigi Pinca luigipinca@gmail.com
Reviewed-By: Yagiz Nizipli yagiz.nizipli@sentry.io

[detached HEAD 72e90752c3] fs: do not crash if the watched file is removed while setting up watch
Author: Matteo Collina hello@matteocollina.com
Date: Fri Jun 14 15:41:53 2024 +0200
2 files changed, 44 insertions(+), 5 deletions(-)
create mode 100644 test/parallel/test-fs-watch-recursive-linux-parallel-remove.js
Rebasing (3/6)
Rebasing (4/6)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
fixup

Signed-off-by: Matteo Collina hello@matteocollina.com
PR-URL: #53452
Reviewed-By: James M Snell jasnell@gmail.com
Reviewed-By: Moshe Atlow moshe@atlow.co.il
Reviewed-By: Marco Ippolito marcoippolito54@gmail.com
Reviewed-By: Chemi Atlow chemi@atlow.co.il
Reviewed-By: Luigi Pinca luigipinca@gmail.com
Reviewed-By: Yagiz Nizipli yagiz.nizipli@sentry.io

[detached HEAD 50f30e08c2] fixup
Author: Matteo Collina hello@matteocollina.com
Date: Fri Jun 14 15:50:44 2024 +0200
2 files changed, 10 insertions(+), 9 deletions(-)
Rebasing (5/6)
Rebasing (6/6)

Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
Update test-fs-watch-recursive-linux-parallel-remove.js

Co-authored-by: Luigi Pinca luigipinca@gmail.com
PR-URL: #53452
Reviewed-By: James M Snell jasnell@gmail.com
Reviewed-By: Moshe Atlow moshe@atlow.co.il
Reviewed-By: Marco Ippolito marcoippolito54@gmail.com
Reviewed-By: Chemi Atlow chemi@atlow.co.il
Reviewed-By: Luigi Pinca luigipinca@gmail.com
Reviewed-By: Yagiz Nizipli yagiz.nizipli@sentry.io

[detached HEAD 5d58ba7f0e] Update test-fs-watch-recursive-linux-parallel-remove.js
Author: Matteo Collina matteo.collina@gmail.com
Date: Sat Jun 15 07:38:45 2024 +0200
1 file changed, 1 insertion(+), 1 deletion(-)

Successfully rebased and updated refs/heads/main.

ℹ Add commit-queue-squash label to land the PR as one commit, or commit-queue-rebase to land as separate commits.

https://github.com/nodejs/node/actions/runs/9548251230

nodejs-github-bot · 2024-06-17T14:28:14Z

Landed in 7430638

Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #53452 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>

Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: nodejs#53452 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>

Signed-off-by: Matteo Collina <hello@matteocollina.com> PR-URL: #53452 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>

fs: do not crash if the watched file is removed while setting up watch

beee1f2

Signed-off-by: Matteo Collina <hello@matteocollina.com>

mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024

nodejs-github-bot added fs Issues and PRs related to the fs subsystem / file system. needs-ci PRs that need a full CI run. labels Jun 14, 2024

mcollina mentioned this pull request Jun 14, 2024

[20.14.0][fs] recursive watch on Linux crashes on .close() #53350

Closed

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024

This comment was marked as outdated.

Sign in to view

fixup

2b0f069

Signed-off-by: Matteo Collina <hello@matteocollina.com>

mcollina requested review from anonrig and jasnell June 14, 2024 13:50

mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024

jasnell approved these changes Jun 14, 2024

View reviewed changes

MoLow approved these changes Jun 14, 2024

View reviewed changes

marco-ippolito approved these changes Jun 14, 2024

View reviewed changes

anonrig reviewed Jun 14, 2024

View reviewed changes

lib/internal/fs/recursive_watch.js Show resolved Hide resolved

atlowChemi approved these changes Jun 14, 2024

View reviewed changes

lpinca approved these changes Jun 14, 2024

View reviewed changes

test/parallel/test-fs-watch-recursive-linux-parallel-remove.js Outdated Show resolved Hide resolved

Update test-fs-watch-recursive-linux-parallel-remove.js

97c7652

Co-authored-by: Luigi Pinca <luigipinca@gmail.com>

mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 15, 2024

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 15, 2024

anonrig approved these changes Jun 17, 2024

View reviewed changes

mcollina added the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 17, 2024

nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Jun 17, 2024

mcollina added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Jun 17, 2024

mcollina added the commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. label Jun 17, 2024

nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 17, 2024

nodejs-github-bot merged commit 7430638 into nodejs:main Jun 17, 2024
63 checks passed

richardlau added the lts-watch-v20.x PRs that may need to be released in v20.x label Jun 17, 2024

targos mentioned this pull request Jun 25, 2024

v22.4.0 release proposal #53583

Merged

Karliz24 mentioned this pull request Jul 9, 2024

## 2024-07-02, Version 22.4.0 (Current), @targos Karliz24/Marley-#16

Open

marco-ippolito mentioned this pull request Jul 19, 2024

v20.16.0 proposal #53945

Merged

campersau mentioned this pull request Aug 21, 2024

Error: ENOENT: no such file or directory, stat '/path/to/repo/.git/index.lock' FredrikNoren/ungit#1588

Closed

targos removed the lts-watch-v20.x PRs that may need to be released in v20.x label Sep 30, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fs: do not crash if the watched file is removed while setting up watch #53452

fs: do not crash if the watched file is removed while setting up watch #53452

mcollina commented Jun 14, 2024

This comment was marked as outdated.

nodejs-github-bot commented Jun 14, 2024

MoLow left a comment

nodejs-github-bot commented Jun 15, 2024

nodejs-github-bot commented Jun 17, 2024

Successfully rebased and updated refs/heads/main.

nodejs-github-bot commented Jun 17, 2024

fs: do not crash if the watched file is removed while setting up watch #53452

fs: do not crash if the watched file is removed while setting up watch #53452

Conversation

mcollina commented Jun 14, 2024

This comment was marked as outdated.

nodejs-github-bot commented Jun 14, 2024

MoLow left a comment

Choose a reason for hiding this comment

nodejs-github-bot commented Jun 15, 2024

nodejs-github-bot commented Jun 17, 2024

Successfully rebased and updated refs/heads/main.

nodejs-github-bot commented Jun 17, 2024