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.

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

src: fix cb scope bugs involved in termination #45596

Merged
merged 1 commit into from Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/api/callback.cc
Expand Up @@ -97,10 +97,9 @@ void InternalCallbackScope::Close() {
if (closed_) return;
closed_ = true;

Isolate* isolate = env_->isolate();
auto idle = OnScopeLeave([&]() { isolate->SetIdle(true); });
// This function must ends up with either cleanup the
// async id stack or pop the topmost one from it

if (!env_->can_call_into_js()) return;
auto perform_stopping_check = [&]() {
if (env_->is_stopping()) {
MarkAsFailed();
Expand All @@ -109,6 +108,11 @@ void InternalCallbackScope::Close() {
};
perform_stopping_check();

if (env_->is_stopping()) return;

Isolate* isolate = env_->isolate();
auto idle = OnScopeLeave([&]() { isolate->SetIdle(true); });

if (!failed_ && async_context_.async_id != 0 && !skip_hooks_) {
AsyncWrap::EmitAfter(env_, async_context_.async_id);
}
Expand Down
1 change: 1 addition & 0 deletions src/api/environment.cc
Expand Up @@ -881,6 +881,7 @@ ThreadId AllocateEnvironmentThreadId() {
}

void DefaultProcessExitHandlerInternal(Environment* env, ExitCode exit_code) {
env->set_stopping(true);
env->set_can_call_into_js(false);
env->stop_sub_worker_contexts();
env->isolate()->DumpAndResetStats();
Expand Down
32 changes: 32 additions & 0 deletions test/parallel/test-unhandled-exception-with-worker-inuse.js
@@ -0,0 +1,32 @@
'use strict';
const common = require('../common');

// https://github.com/nodejs/node/issues/45421
//
// Check that node will NOT call v8::Isolate::SetIdle() when exiting
// due to an unhandled exception, otherwise the assertion(enabled in
// debug build only) in the SetIdle(), which checks that the vm state
// is either EXTERNAL or IDLE will fail.
//
// The root cause of this issue is that before PerIsolateMessageListener()
// is invoked by v8, v8 preserves the JS vm state, although it should
// switch to EXTERNEL. https://bugs.chromium.org/p/v8/issues/detail?id=13464
//
// Therefore, this commit can be considered as an workaround of the v8 bug,
// but we also find it not useful to call SetIdle() when terminating.

if (process.argv[2] === 'child') {
const { Worker } = require('worker_threads');
new Worker('', { eval: true });
throw new Error('xxx');
} else {
const assert = require('assert');
const { spawnSync } = require('child_process');
const result = spawnSync(process.execPath, [__filename, 'child']);

const stderr = result.stderr.toString().trim();
// Expect error message to be preserved
assert.match(stderr, /xxx/);
// Expect no crash
assert(!common.nodeProcessAborted(result.status, result.signal), stderr);
}