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

fix: fix consul plugin worker will not exit while reload or quit #10342

Merged
merged 2 commits into from
Oct 20, 2023
Merged

fix: fix consul plugin worker will not exit while reload or quit #10342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce0382d
[2023-10-16][fix consul process leak while worker quit or reload]
Oct 16, 2023
9ac6c7a
[2023-10-18][moving check exiting before ngx_timer_at]
Oct 18, 2023
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
3 changes: 2 additions & 1 deletion apisix/discovery/consul/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ local ngx_timer_every = ngx.timer.every
local log = core.log
local json_delay_encode = core.json.delay_encode
local ngx_worker_id = ngx.worker.id
local exiting = ngx.worker.exiting
local thread_spawn = ngx.thread.spawn
local thread_wait = ngx.thread.wait
local thread_kill = ngx.thread.kill
Expand Down Expand Up @@ -276,7 +277,7 @@ end


local function check_keepalive(consul_server, retry_delay)
if consul_server.keepalive then
if consul_server.keepalive and not exiting() then
local ok, err = ngx_timer_at(0, _M.connect, consul_server, retry_delay)
if not ok then
log.error("create ngx_timer_at got error: ", err)
Expand Down