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: fixes recursive fs.watch crash on Linux when deleting files #52349

Merged
merged 10 commits into from
Apr 19, 2024
Merged

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

merged 10 commits into from
Apr 19, 2024

Conversation

mcollina
Copy link
Member

@mcollina mcollina commented Apr 3, 2024

Fixes: #52018

@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Apr 3, 2024
@mcollina mcollina requested a review from anonrig April 3, 2024 14:42
@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 Apr 3, 2024
@mcollina mcollina requested review from cjihrig and aduh95 April 3, 2024 14:42
@mcollina mcollina mentioned this pull request Apr 3, 2024
Closed
@mcollina mcollina added the lts-watch-v20.x PRs that may need to be released in v20.x label Apr 3, 2024
@mcollina
fixup
6e8c33b 
Signed-off-by: Matteo Collina <[email protected]>
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Apr 3, 2024
@nodejs-github-bot
Copy link
Collaborator

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

@anonrig
Copy link
Member

anonrig commented Apr 10, 2024

Tests seems to fail on macOS @mcollina

mcollina and others added 3 commits April 11, 2024 11:45
@mcollina
fixup
52fd037 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina @MoLow
Update test/parallel/test-fs-watch-recursive-delete.js
a95ff83 
Co-authored-by: Moshe Atlow <[email protected]>
@mcollina
fixup
0635a8a 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Apr 11, 2024
@mcollina
Copy link
Member Author

@MoLow ptal

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

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

@mcollina
fixup
805e8b0 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Apr 11, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Apr 11, 2024
@nodejs-github-bot
Copy link
Collaborator

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

mcollina added 2 commits April 11, 2024 15:43
@mcollina
fixup
5c50a1e 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina
fixup
c7ed046 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina mcollina added the request-ci Add this label to start a Jenkins CI on a PR. label Apr 11, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Apr 18, 2024
@anonrig anonrig added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels Apr 18, 2024
@nodejs-github-bot
Copy link
Collaborator

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

@mcollina
fixup
3a358b2 
Signed-off-by: Matteo Collina <[email protected]>
@mcollina mcollina added request-ci Add this label to start a Jenkins CI on a PR. and removed request-ci Add this label to start a Jenkins CI on a PR. labels Apr 18, 2024
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Apr 18, 2024
@nodejs-github-bot
Copy link
Collaborator

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

@nodejs-github-bot
Copy link
Collaborator

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

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

Commit Queue failed
- Loading data for nodejs/node/pull/52349
✔  Done loading data for nodejs/node/pull/52349
----------------------------------- PR info ------------------------------------
Title      fs: fixes recursive fs.watch crash on Linux when deleting files (#52349)
Author     Matteo Collina  (@mcollina)
Branch     mcollina:fix-52018 -> nodejs:main
Labels     fs, author ready, needs-ci, lts-watch-v20.x
Commits    10
 - fs: fixes recursive fs.watch crash on Linux when deleting files
 - fixup
 - fixup
 - Update test/parallel/test-fs-watch-recursive-delete.js
 - fixup
 - fixup
 - fixup
 - fixup
 - fixup
 - fixup
Committers 2
 - Matteo Collina 
 - GitHub 
PR-URL: https://github.com/nodejs/node/pull/52349
Fixes: https://github.com/nodejs/node/issues/52018
Reviewed-By: Yagiz Nizipli 
Reviewed-By: Moshe Atlow 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/52349
Fixes: https://github.com/nodejs/node/issues/52018
Reviewed-By: Yagiz Nizipli 
Reviewed-By: Moshe Atlow 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Wed, 03 Apr 2024 14:42:00 GMT
   ✔  Approvals: 2
   ✔  - Yagiz Nizipli (@anonrig) (TSC): https://github.com/nodejs/node/pull/52349#pullrequestreview-2009056028
   ✔  - Moshe Atlow (@MoLow) (TSC): https://github.com/nodejs/node/pull/52349#pullrequestreview-2009091163
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2024-04-18T17:34:54Z: https://ci.nodejs.org/job/node-test-pull-request/58502/
- Querying data for job/node-test-pull-request/58502/
   ✔  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 52349
From https://github.com/nodejs/node
 * branch                  refs/pull/52349/merge -> FETCH_HEAD
✔  Fetched commits as 580aae58f62c..3a358b291a3f
--------------------------------------------------------------------------------
[main 0211a26868] fs: fixes recursive fs.watch crash on Linux when deleting files
 Author: Matteo Collina 
 Date: Wed Apr 3 16:40:46 2024 +0200
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 test/parallel/test-fs-watch-recursive-delete.js
[main ddb4e31ca1] fixup
 Author: Matteo Collina 
 Date: Wed Apr 3 16:52:27 2024 +0200
 2 files changed, 13 insertions(+), 17 deletions(-)
[main e4e2bebb2d] fixup
 Author: Matteo Collina 
 Date: Thu Apr 11 11:45:50 2024 +0200
 1 file changed, 2 insertions(+), 1 deletion(-)
[main d23c7c8330] Update test/parallel/test-fs-watch-recursive-delete.js
 Author: Matteo Collina 
 Date: Thu Apr 11 11:46:31 2024 +0200
 1 file changed, 3 insertions(+), 2 deletions(-)
[main 6669dac5e8] fixup
 Author: Matteo Collina 
 Date: Thu Apr 11 11:47:23 2024 +0200
 1 file changed, 2 insertions(+), 3 deletions(-)
[main 1c8c1ef7f9] fixup
 Author: Matteo Collina 
 Date: Thu Apr 11 13:37:38 2024 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
[main e08d7b4c34] fixup
 Author: Matteo Collina 
 Date: Thu Apr 11 15:43:11 2024 +0200
 1 file changed, 6 insertions(+), 4 deletions(-)
[main 61410fe592] fixup
 Author: Matteo Collina 
 Date: Thu Apr 11 16:54:50 2024 +0200
 1 file changed, 6 insertions(+), 2 deletions(-)
[main 14cf96222c] fixup
 Author: Matteo Collina 
 Date: Thu Apr 18 16:18:58 2024 +0200
 1 file changed, 3 insertions(+)
[main 0cb4e9b123] fixup
 Author: Matteo Collina 
 Date: Thu Apr 18 16:26:10 2024 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)
   ✔  Patches applied
There are 10 commits in the PR. Attempting autorebase.
Rebasing (2/20)

Executing: git node land --amend --yes

⚠  Found Fixes: #52018, skipping..

--------------------------------- New Message ----------------------------------

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


Signed-off-by: Matteo Collina [email protected]

Fixes: #52018

PR-URL: #52349

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 0a2ab5f5f4] fs: fixes recursive fs.watch crash on Linux when deleting files

Author: Matteo Collina [email protected]

Date: Wed Apr 3 16:40:46 2024 +0200

2 files changed, 32 insertions(+), 3 deletions(-)

create mode 100644 test/parallel/test-fs-watch-recursive-delete.js

Rebasing (3/20)

Rebasing (4/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD f645121b66] fixup

Author: Matteo Collina [email protected]

Date: Wed Apr 3 16:52:27 2024 +0200

2 files changed, 13 insertions(+), 17 deletions(-)

Rebasing (5/20)

Rebasing (6/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 51710a86f0] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 11 11:45:50 2024 +0200

1 file changed, 2 insertions(+), 1 deletion(-)

Rebasing (7/20)

Rebasing (8/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

Update test/parallel/test-fs-watch-recursive-delete.js


Co-authored-by: Moshe Atlow [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 123905fff6] Update test/parallel/test-fs-watch-recursive-delete.js

Author: Matteo Collina [email protected]

Date: Thu Apr 11 11:46:31 2024 +0200

1 file changed, 3 insertions(+), 2 deletions(-)

Rebasing (9/20)

Rebasing (10/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 7ea8971cc7] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 11 11:47:23 2024 +0200

1 file changed, 2 insertions(+), 3 deletions(-)

Rebasing (11/20)

Rebasing (12/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD aac730083e] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 11 13:37:38 2024 +0200

1 file changed, 1 insertion(+), 1 deletion(-)

Rebasing (13/20)

Rebasing (14/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 9af0911c59] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 11 15:43:11 2024 +0200

1 file changed, 6 insertions(+), 4 deletions(-)

Rebasing (15/20)

Rebasing (16/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD b526b8fabe] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 11 16:54:50 2024 +0200

1 file changed, 6 insertions(+), 2 deletions(-)

Rebasing (17/20)

Rebasing (18/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD b2d132ec50] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 18 16:18:58 2024 +0200

1 file changed, 3 insertions(+)

Rebasing (19/20)

Rebasing (20/20)


Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

fixup


Signed-off-by: Matteo Collina [email protected]

PR-URL: #52349

Fixes: #52018

Reviewed-By: Yagiz Nizipli [email protected]

Reviewed-By: Moshe Atlow [email protected]


[detached HEAD 557e389aff] fixup

Author: Matteo Collina [email protected]

Date: Thu Apr 18 16:26:10 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/8753676430

@mcollina mcollina added commit-queue-squash Add this label to instruct the Commit Queue to squash all the PR commits into the first one. 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 Apr 19, 2024
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Apr 19, 2024
@nodejs-github-bot nodejs-github-bot merged commit d3eb1cb into nodejs:main Apr 19, 2024
67 checks passed
@nodejs-github-bot
Copy link
Collaborator

Landed in d3eb1cb

aduh95 pushed a commit that referenced this pull request Apr 29, 2024
@mcollina @aduh95
fs: fixes recursive fs.watch crash on Linux when deleting files
a7e03d3 
Signed-off-by: Matteo Collina <[email protected]>
Fixes: #52018
PR-URL: #52349
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
@aduh95 aduh95 mentioned this pull request Apr 30, 2024
Merged
marco-ippolito pushed a commit that referenced this pull request May 2, 2024
@mcollina @marco-ippolito
fs: fixes recursive fs.watch crash on Linux when deleting files
0156c3e 
Signed-off-by: Matteo Collina <[email protected]>
Fixes: #52018
PR-URL: #52349
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
@marco-ippolito marco-ippolito mentioned this pull request May 2, 2024
Merged
marco-ippolito pushed a commit that referenced this pull request May 3, 2024
@mcollina @marco-ippolito
fs: fixes recursive fs.watch crash on Linux when deleting files
e7d0d80 
Signed-off-by: Matteo Collina <[email protected]>
Fixes: #52018
PR-URL: #52349
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Moshe Atlow <[email protected]>
This was referenced May 20, 2024
Merged
Closed
@targos targos removed the lts-watch-v20.x PRs that may need to be released in v20.x label Sep 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MoLow MoLow MoLow approved these changes

@anonrig anonrig anonrig approved these changes

@cjihrig cjihrig Awaiting requested review from cjihrig

@aduh95 aduh95 Awaiting requested review from aduh95

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. 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. 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.

Recursive fs.watch crashes on Linux when deleting files
5 participants
@mcollina @nodejs-github-bot @anonrig @MoLow @targos