Skip to content

Commit

Permalink
src: fix cb scope bugs involved in termination
Browse files Browse the repository at this point in the history
Be more aggresive to clean up the async id stack,
and ensure the cleanup when terminating.

Calling SetIdle() when terminating is not harmless.
When node terminates due to an unhandled exception,
v8 preseves the vm state, which is JS and notifies
node through PerIsolateMessageListener(). If node
calls SetIdle() later, v8 complains because it
requires the vm state to either be EXTERNEL or IDLE
when embedder calling SetIdle().

PR-URL: #45596
Reviewed-By: Chengzhong Wu <[email protected]>
  • Loading branch information
ywave620 authored and targos committed Mar 14, 2023
1 parent cc74821 commit 9fab228
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/api/callback.cc
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -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);
}

0 comments on commit 9fab228

Please sign in to comment.