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

[v12.x backport] async_hooks: fix resource stack for deep stacks #35287

Closed
wants to merge 1 commit into from
Closed

[v12.x backport] async_hooks: fix resource stack for deep stacks #35287

wants to merge 1 commit into from

Conversation

johanneswuerbach
Copy link

Backport for #34573

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

@addaleax @johanneswuerbach
async_hooks: fix resource stack for deep stacks
5362bef 
460c81d introduced a bug where the execution resource was not
stored properly if we needed to call into C++ to extend the stack size.
Fix that bug by always storing the resource.

Refs: nodejs#34319
Fixes: nodejs#34556

PR-URL: nodejs#34573
Reviewed-By: Andrey Pechkurov <apechkurov@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Gus Caplan <me@gus.host>
@nodejs-github-bot nodejs-github-bot added async_hooks Issues and PRs related to the async hooks subsystem. v12.x labels Sep 21, 2020
@johanneswuerbach johanneswuerbach mentioned this pull request Sep 21, 2020
Merged
@addaleax
Copy link
Member

Hi!

Can you provide a bit more context here? #34573 fixes a bug that was introduced by #34319, and together they land cleanly on v12.x, so I don’t think a backport would be required here (only that they are released together)?

@addaleax addaleax force-pushed the v12.x-staging branch 4 times, most recently from 55fe022 to 65b7bf4 Compare September 22, 2020 17:57
@addaleax
Copy link
Member

These commits have been landed on v12.x-staging, so I think we’re good here. Thanks for the PR, though!

@addaleax addaleax closed this Sep 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
async_hooks Issues and PRs related to the async hooks subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@johanneswuerbach @addaleax @nodejs-github-bot