FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fs: pass the error if directory already closed by Lxxyx · Pull Request #36243 · nodejs/node · GitHub

/ node Public

fs: pass the error if directory already closed - #36243

Merged
aduh95 merged 0 commit into
nodejs:masterfrom
Lxxyx:fix/dir-close-throws
Nov 27, 2020
ConversationCommits (0)ChecksFiles changed
Merged

fs: pass the error if directory already closed#36243
aduh95 merged 0 commit into
nodejs:masterfrom
Lxxyx:fix/dir-close-throws

Conversation

Lxxyx commented Nov 24, 2020

Copy link
Copy Markdown
Member

Asynchronous functions should forward errors via callback.
In the case of Promise, errors can be caught with Promise.catch

Fixes: #36237

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

nodejs-github-bot added the fs Issues and PRs related to the fs subsystem / file system. label Nov 24, 2020
targos reviewed Nov 24, 2020
View reviewed changes
Comment thread lib/internal/fs/dir.js Outdated
Comment thread lib/internal/fs/dir.js Outdated
Comment thread lib/internal/fs/dir.js Outdated
Lxxyx force-pushed the fix/dir-close-throws branch from 65a8561 to cb6b8a2 Compare November 24, 2020 09:33

Lxxyx commented Nov 24, 2020

Copy link
Copy Markdown
Member Author

Thanks for the guide, the code has been updated. @targos @aduh95

Lxxyx requested review from aduh95 and targos November 24, 2020 09:35
aduh95 reviewed Nov 24, 2020
View reviewed changes
Comment thread lib/internal/fs/dir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Lxxyx force-pushed the fix/dir-close-throws branch from cb6b8a2 to b0b499f Compare November 24, 2020 10:53

Lxxyx commented Nov 24, 2020

Copy link
Copy Markdown
Member Author

Thanks for the Review, changes have been pushed. @aduh95

Lxxyx requested a review from aduh95 November 24, 2020 10:55
aduh95 reviewed Nov 24, 2020
View reviewed changes

aduh95 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

On a second thought, I think the tests could be improved a bit:

Comment thread test/parallel/test-fs-opendir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Comment thread test/parallel/test-fs-opendir.js Outdated
Lxxyx force-pushed the fix/dir-close-throws branch from b0b499f to 1fb210c Compare November 25, 2020 03:15

Lxxyx commented Nov 25, 2020

Copy link
Copy Markdown
Member Author

Thanks, learned a lot about how to test Node.js. The code has been updated @aduh95

aduh95 added author ready PRs that have at least one approval, no outstanding review comments, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels Nov 25, 2020
github-actions Bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Nov 25, 2020

This comment has been minimized.

Sign in to view

This comment has been minimized.

Sign in to view
joyeecheung approved these changes Nov 25, 2020
View reviewed changes

joyeecheung left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Still LGTM

nodejs-github-bot commented Nov 25, 2020 •
edited by aduh95
Loading

Copy link
Copy Markdown
Collaborator

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

aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Nov 27, 2020
github-actions 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 Nov 27, 2020

github-actions Bot commented Nov 27, 2020

Copy link
Copy Markdown
Contributor
Commit Queue failed
- Loading data for nodejs/node/pull/36243
✔  Done loading data for nodejs/node/pull/36243
----------------------------------- PR info ------------------------------------
Title      fs/dir: pass the error to the callback or Promise.catch if already closed (#36243)
Author     Lxxyx  (@Lxxyx, first-time contributor)
Branch     Lxxyx:fix/dir-close-throws -> nodejs:master
Labels     author ready, fs
Commits    1
 - fs/dir: pass the error to the callback or Promise.catch if already cl…
Committers 1
 - Zijian Liu 
PR-URL: https://github.com/nodejs/node/pull/36243
Fixes: https://github.com/nodejs/node/issues/36237
Reviewed-By: Antoine du Hamel 
Reviewed-By: Joyee Cheung 
Reviewed-By: Rich Trott 
Reviewed-By: Yongsheng Zhang 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/36243
Fixes: https://github.com/nodejs/node/issues/36237
Reviewed-By: Antoine du Hamel 
Reviewed-By: Joyee Cheung 
Reviewed-By: Rich Trott 
Reviewed-By: Yongsheng Zhang 
--------------------------------------------------------------------------------
   ✔  Last GitHub Actions successful
   ℹ  Last Full PR CI on 2020-11-25T15:23:50Z: https://ci.nodejs.org/job/node-test-pull-request/34556/
- Querying data for job/node-test-pull-request/34556/
✔  Build data downloaded
   ✔  Last Jenkins CI successful
   ℹ  This PR was created on Tue, 24 Nov 2020 06:32:49 GMT
   ✔  Approvals: 4
   ✔  - Antoine du Hamel (@aduh95): https://github.com/nodejs/node/pull/36243#pullrequestreview-538317002
   ✔  - Joyee Cheung (@joyeecheung) (TSC): https://github.com/nodejs/node/pull/36243#pullrequestreview-538603019
   ✔  - Rich Trott (@Trott) (TSC): https://github.com/nodejs/node/pull/36243#pullrequestreview-539312063
   ✔  - Yongsheng Zhang (@ZYSzys): https://github.com/nodejs/node/pull/36243#pullrequestreview-539441282
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/master up to date...
From https://github.com/nodejs/node
 * branch                  master     -> FETCH_HEAD
✔  origin/master is now up-to-date
- Downloading patch for 36243
From https://github.com/nodejs/node
 * branch                  refs/pull/36243/merge -> FETCH_HEAD
✔  Fetched commits as b4c2ff5a3bb5..1fb210c50356
--------------------------------------------------------------------------------
[master 7e448d0bca] fs/dir: pass the error to the callback or Promise.catch if already closed
 Author: Zijian Liu 
 Date: Tue Nov 24 14:30:26 2020 +0800
 2 files changed, 32 insertions(+), 8 deletions(-)
   ✔  Patches applied
--------------------------------------------------------------------------------
   ⚠  Found Fixes: https://github.com/nodejs/node/issues/36237, skipping..
--------------------------------- New Message ----------------------------------
fs/dir: pass the error to the callback or Promise.catch if already closed

Asynchronous functions should forward errors via callback.

In the case of Promise, errors can be caught with Promise.catch


Fixes: #36237


PR-URL: #36243

Reviewed-By: Antoine du Hamel duhamelantoine1995@gmail.com

Reviewed-By: Joyee Cheung joyeec9h3@gmail.com

Reviewed-By: Rich Trott rtrott@gmail.com

Reviewed-By: Yongsheng Zhang zyszys98@gmail.com


[master d662e3e511] fs/dir: pass the error to the callback or Promise.catch if already closed

Author: Zijian Liu Lxxyxzj@gmail.com

Date: Tue Nov 24 14:30:26 2020 +0800

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

✖  d662e3e51170c112b172f51bc028412b83a71ed7

✔  4:7      Valid fixes URL.                          fixes-url

✔  0:0      blank line after title                    line-after-title

✔  0:0      line-lengths are valid                    line-length

✔  0:0      metadata is at end of message             metadata-end

✔  6:8      PR-URL is valid.                          pr-url

✔  0:0      reviewers are valid                       reviewers

✖  0:0      Invalid subsystem: "fs/dir"               subsystem

✔  0:0      Title is formatted correctly.             title-format

✖  0:72     Title must be <= 72 columns.              title-length

ℹ  Please fix the commit message and try again.
https://github.com/nodejs/node/actions/runs/387516680

Lxxyx changed the title fs/dir: pass the error to the callback or Promise.catch if already closed fs: pass the error if directory already closed Nov 27, 2020

Lxxyx commented Nov 27, 2020

Copy link
Copy Markdown
Member Author

Tried to update the name of Pull Request to avoid "Commit Queue failed" error. @aduh95

aduh95 commented Nov 27, 2020

Copy link
Copy Markdown
Contributor

Landed in b938f88

aduh95 closed this Nov 27, 2020
aduh95 force-pushed the fix/dir-close-throws branch from 1fb210c to b938f88 Compare November 27, 2020 17:47
aduh95 merged commit b938f88 into nodejs:master Nov 27, 2020
Lxxyx deleted the fix/dir-close-throws branch December 4, 2020 04:11
danielleadams pushed a commit that referenced this pull request Dec 7, 2020
fs: pass ERR_DIR_CLOSED asynchronously to dir.close
744b8aa 
Pass the error to the callback or returns a rejected Promise instead of
throwing a synchonous error.

Fixes: #36237

PR-URL: #36243
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
danielleadams mentioned this pull request Dec 7, 2020
Merged
targos pushed a commit that referenced this pull request May 1, 2021
fs: pass ERR_DIR_CLOSED asynchronously to dir.close
1bffd8d 
Pass the error to the callback or returns a rejected Promise instead of
throwing a synchonous error.

Fixes: #36237

PR-URL: #36243
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
danielleadams mentioned this pull request May 3, 2021
Merged
targos removed the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Sep 5, 2021
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Trott Trott approved these changes
joyeecheung joyeecheung approved these changes
aduh95 aduh95 approved these changes
ZYSzys ZYSzys approved these changes
targos Awaiting requested review from targos

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no outstanding review comments, and a CI started. fs Issues and PRs related to the fs subsystem / file system.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Asynchronous dir.close() throws immediately, if already closed

7 participants

Back | FazBrowse Home | New Git URL