Skip to content

bugfix: prevent uthread crash by checking coroutine reference before … #398

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

Merged
zhuizhuhaomeng merged 2 commits into from
Mar 10, 2026
Merged

bugfix: prevent uthread crash by checking coroutine reference before … #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdda724
bugfix: prevent uthread crash by checking coroutine reference before …
oowl Mar 10, 2026
c2ff2cf
bugfix: prevent uthread crash by checking coroutine reference before …
oowl Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/ngx_stream_lua_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,8 +1051,10 @@ ngx_stream_lua_run_thread(lua_State *L, ngx_stream_lua_request_t *r,
return NGX_AGAIN;
}

ngx_stream_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
ctx->uthreads--;
if (ctx->cur_co_ctx->co_ref != LUA_NOREF) {
ngx_stream_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
ctx->uthreads--;
}

if (ctx->uthreads == 0) {
if (ngx_stream_lua_entry_thread_alive(ctx)) {
Expand Down Expand Up @@ -1090,7 +1092,9 @@ ngx_stream_lua_run_thread(lua_State *L, ngx_stream_lua_request_t *r,
lua_xmove(ctx->cur_co_ctx->co, next_co, nrets);
}

if (ctx->cur_co_ctx->is_uthread) {
if (ctx->cur_co_ctx->is_uthread
&& ctx->cur_co_ctx->co_ref != LUA_NOREF)
{
ngx_stream_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
ctx->uthreads--;
}
Expand Down Expand Up @@ -1201,8 +1205,10 @@ ngx_stream_lua_run_thread(lua_State *L, ngx_stream_lua_request_t *r,
return NGX_AGAIN;
}

ngx_stream_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
ctx->uthreads--;
if (ctx->cur_co_ctx->co_ref != LUA_NOREF) {
ngx_stream_lua_del_thread(r, L, ctx, ctx->cur_co_ctx);
ctx->uthreads--;
}

if (ctx->uthreads == 0) {
if (ngx_stream_lua_entry_thread_alive(ctx)) {
Expand Down
81 changes: 81 additions & 0 deletions t/127-uthread-kill.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ plan tests => repeat_each() * (blocks() * 5 + 1);

$ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8';
$ENV{TEST_NGINX_MEMCACHED_PORT} ||= '11211';
$ENV{TEST_NGINX_REDIS_PORT} ||= '6379';
Copy link

Copilot AI Mar 10, 2026

Choose a reason for hiding this comment

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

The test plan formula blocks() * 5 + 1 was designed for the original 6 test blocks, each of which had stap_out, stream_response, no_error_log, and error_log sections. The new single test block (TEST 7) only has stream_response and no_error_log — it lacks stap_out and error_log sections. The multiplier 5 is now incorrect and will cause a test plan mismatch, leading to test failure. The plan should be updated to match the actual test sections present in the remaining test blocks. If the existing TEST 1-6 are restored (as they should be), the plan would need to account for both old and new test structures.

Copilot uses AI. Check for mistakes.

#no_shuffle();
no_long_string();
Expand Down Expand Up @@ -313,3 +314,83 @@ thread created: zombie
[alert]
stream lua tcp socket abort resolver
--- error_log



=== TEST 7: no phantom uthreads decrement after killing parent uthread
--- stream_server_config
content_by_lua_block {
local redis_port = $TEST_NGINX_REDIS_PORT
local dns_threads = {}

dns_threads[1] = ngx.thread.spawn(function()
local sock = ngx.socket.tcp()
sock:settimeout(2000)
local ok, err = sock:connect("127.0.0.1", redis_port)
if not ok then
return nil, err
end

sock:send("PING\r\n")
local line = sock:receive()
sock:setkeepalive()
return line
end)

dns_threads[2] = ngx.thread.spawn(function()
local child = coroutine.create(function()
local sock = ngx.socket.tcp()
sock:settimeout(2000)
local ok, err = sock:connect("127.0.0.1", redis_port)
if not ok then
return nil, err
end

sock:send("PING\r\n")
local line = sock:receive()
sock:setkeepalive()
return line
end)

local ok, res = coroutine.resume(child)
return res
end)

ngx.thread.wait(dns_threads[1], dns_threads[2])

for _, t in ipairs(dns_threads) do
ngx.thread.kill(t)
end

local probe_threads = {}
for i = 1, 10 do
probe_threads[i] = ngx.thread.spawn(function()
local sock = ngx.socket.tcp()
sock:settimeout(2000)
local ok, err = sock:connect("127.0.0.1", redis_port)
if not ok then
return nil, err
end

sock:send("PING\r\n")
local line = sock:receive()
sock:setkeepalive()
return line
end)
end

local ok_count = 0
for i = 1, #probe_threads do
local ok, res = ngx.thread.wait(probe_threads[i])
if ok and res then
ok_count = ok_count + 1
end
end

ngx.say("ok_count=", ok_count)
}
--- stream_response
ok_count=10
--- no_error_log
[error]
[alert]