Skip to content

Commit b6459ec

Browse files
HarshithaKPaddaleax
authored andcommitted
worker: runtime error on pthread creation
With large number of worker threads pthread fails with hard assertion. Instead of hard assertion throw a runtime error. PR-URL: #32344 Fixes: #32319 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a5e81e7 commit b6459ec

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

src/node_errors.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ void OnFatalError(const char* location, const char* message);
5858
V(ERR_TRANSFERRING_EXTERNALIZED_SHAREDARRAYBUFFER, TypeError) \
5959
V(ERR_TLS_PSK_SET_IDENTIY_HINT_FAILED, Error) \
6060
V(ERR_VM_MODULE_CACHED_DATA_REJECTED, Error) \
61+
V(ERR_WORKER_INIT_FAILED, Error) \
6162
V(ERR_PROTO_ACCESS, Error)
6263

6364
#define V(code, type) \
@@ -107,6 +108,7 @@ void OnFatalError(const char* location, const char* message);
107108
V(ERR_TRANSFERRING_EXTERNALIZED_SHAREDARRAYBUFFER, \
108109
"Cannot serialize externalized SharedArrayBuffer") \
109110
V(ERR_TLS_PSK_SET_IDENTIY_HINT_FAILED, "Failed to set PSK identity hint") \
111+
V(ERR_WORKER_INIT_FAILED, "Worker initialization failure") \
110112
V(ERR_PROTO_ACCESS, \
111113
"Accessing Object.prototype.__proto__ has been " \
112114
"disallowed with --disable-proto=throw")

src/node_worker.cc

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
602602
uv_thread_options_t thread_options;
603603
thread_options.flags = UV_THREAD_HAS_STACK_SIZE;
604604
thread_options.stack_size = kStackSize;
605-
CHECK_EQ(uv_thread_create_ex(&w->tid_, &thread_options, [](void* arg) {
605+
int ret = uv_thread_create_ex(&w->tid_, &thread_options, [](void* arg) {
606606
// XXX: This could become a std::unique_ptr, but that makes at least
607607
// gcc 6.3 detect undefined behaviour when there shouldn't be any.
608608
// gcc 7+ handles this well.
@@ -623,7 +623,23 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
623623
w->JoinThread();
624624
// implicitly delete w
625625
});
626-
}, static_cast<void*>(w)), 0);
626+
}, static_cast<void*>(w));
627+
if (ret != 0) {
628+
char err_buf[128];
629+
uv_err_name_r(ret, err_buf, sizeof(err_buf));
630+
w->custom_error_ = "ERR_WORKER_INIT_FAILED";
631+
w->custom_error_str_ = err_buf;
632+
w->loop_init_failed_ = true;
633+
w->thread_joined_ = true;
634+
w->stopped_ = true;
635+
w->env()->remove_sub_worker_context(w);
636+
{
637+
Isolate* isolate = w->env()->isolate();
638+
HandleScope handle_scope(isolate);
639+
THROW_ERR_WORKER_INIT_FAILED(isolate, err_buf);
640+
}
641+
w->MakeWeak();
642+
}
627643
}
628644

629645
void Worker::StopThread(const FunctionCallbackInfo<Value>& args) {

0 commit comments

Comments
 (0)