Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Jun 17, 2024
Merged

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

merged 3 commits into from
Jun 17, 2024

Conversation

mcollina
Copy link
Member

Fixes #53350

@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024
@nodejs-github-bot 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 mcollina mentioned this pull request Jun 14, 2024
Closed
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@mcollina
fixup
2b0f069 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina mcollina requested review from anonrig and jasnell June 14, 2024 13:50
@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 14, 2024
@nodejs-github-bot
Copy link
Collaborator

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

MoLow
MoLow approved these changes Jun 14, 2024
View reviewed changes
Copy link
Member

@MoLow MoLow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Jun 15, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jun 15, 2024
@nodejs-github-bot
Copy link
Collaborator

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

@mcollina mcollina added the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 17, 2024
@nodejs-github-bot 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
@nodejs-github-bot
Copy link
Collaborator

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 [email protected]

PR-URL: #53452

Reviewed-By: James M Snell [email protected]

Reviewed-By: Moshe Atlow [email protected]

Reviewed-By: Marco Ippolito [email protected]

Reviewed-By: Chemi Atlow [email protected]

Reviewed-By: Luigi Pinca [email protected]

Reviewed-By: Yagiz Nizipli [email protected]


[detached HEAD 72e90752c3] fs: do not crash if the watched file is removed while setting up watch

Author: Matteo Collina [email protected]

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 [email protected]

PR-URL: #53452

Reviewed-By: James M Snell [email protected]

Reviewed-By: Moshe Atlow [email protected]

Reviewed-By: Marco Ippolito [email protected]

Reviewed-By: Chemi Atlow [email protected]

Reviewed-By: Luigi Pinca [email protected]

Reviewed-By: Yagiz Nizipli [email protected]


[detached HEAD 50f30e08c2] fixup

Author: Matteo Collina [email protected]

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 [email protected]

PR-URL: #53452

Reviewed-By: James M Snell [email protected]

Reviewed-By: Moshe Atlow [email protected]

Reviewed-By: Marco Ippolito [email protected]

Reviewed-By: Chemi Atlow [email protected]

Reviewed-By: Luigi Pinca [email protected]

Reviewed-By: Yagiz Nizipli [email protected]


[detached HEAD 5d58ba7f0e] Update test-fs-watch-recursive-linux-parallel-remove.js

Author: Matteo Collina [email protected]

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

@mcollina 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 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 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 nodejs-github-bot merged commit 7430638 into nodejs:main Jun 17, 2024
63 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in 7430638

@richardlau richardlau added the lts-watch-v20.x PRs that may need to be released in v20.x label Jun 17, 2024
targos pushed a commit that referenced this pull request Jun 20, 2024
@mcollina @targos
fs: do not crash if the watched file is removed while setting up watch
568377f 
Signed-off-by: Matteo Collina <[email protected]>
PR-URL: #53452
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
Reviewed-By: Marco Ippolito <[email protected]>
Reviewed-By: Chemi Atlow <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
EliphazB pushed a commit to EliphazB/node that referenced this pull request Jun 20, 2024
@mcollina @EliphazB
fs: do not crash if the watched file is removed while setting up watch
208df39 
Signed-off-by: Matteo Collina <[email protected]>
PR-URL: nodejs#53452
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
Reviewed-By: Marco Ippolito <[email protected]>
Reviewed-By: Chemi Atlow <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
bmeck pushed a commit to bmeck/node that referenced this pull request Jun 22, 2024
@mcollina @bmeck
fs: do not crash if the watched file is removed while setting up watch
b9f904b 
Signed-off-by: Matteo Collina <[email protected]>
PR-URL: nodejs#53452
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
Reviewed-By: Marco Ippolito <[email protected]>
Reviewed-By: Chemi Atlow <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>
@targos targos mentioned this pull request Jun 25, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell jasnell approved these changes

@lpinca lpinca lpinca approved these changes

@anonrig anonrig anonrig approved these changes

@MoLow MoLow MoLow approved these changes

@marco-ippolito marco-ippolito marco-ippolito approved these changes

@atlowChemi atlowChemi atlowChemi approved these changes

Assignees
No one assigned
Labels
commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. fs Issues and PRs related to the fs subsystem / file system. lts-watch-v20.x PRs that may need to be released in v20.x needs-ci PRs that need a full CI run.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[20.14.0][fs] recursive watch on Linux crashes on .close()
9 participants
@mcollina @nodejs-github-bot @jasnell @lpinca @anonrig @MoLow @marco-ippolito @atlowChemi @richardlau