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

tests(*): make nginx_worker_processes to take effect properly #14222

Merged
merged 2 commits into from
Feb 5, 2025
Merged

tests(*): make nginx_worker_processes to take effect properly #14222

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
3021f38
tests(*): make nginx_worker_processes to take effect properly
ms2008 Jan 24, 2025
48fb4c1
tests(*): adjusting flaky test cases
ms2008 Jan 24, 2025
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
4 changes: 2 additions & 2 deletions spec/02-integration/02-cmd/02-start_stop_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ local function wait_until_healthy(prefix)
if conf.admin_listen and conf.admin_listen ~= "off" then
local port = assert(conf.admin_listen:match(":([0-9]+)"))
assert
.with_timeout(5)
.with_timeout(10)
.eventually(function()
local client = helpers.admin_client(1000, port)
local res, err = client:send({ path = "/status", method = "GET" })
Expand Down Expand Up @@ -413,7 +413,7 @@ describe("kong start/stop #" .. strategy, function()
assert(helpers.start_kong({
database = "off",
declarative_config = yaml_file,
nginx_worker_processes = 100, -- stress test initialization
nginx_worker_processes = 50, -- stress test initialization
nginx_conf = "spec/fixtures/custom_nginx.template",
}))

Expand Down
2 changes: 1 addition & 1 deletion spec/02-integration/05-proxy/02-router_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2542,7 +2542,7 @@ for _, strategy in helpers.each_strategy() do

local workers_before = helpers.get_kong_workers()
assert(helpers.signal_workers(nil, "-TERM"))
helpers.wait_until_no_common_workers(workers_before, 1) -- respawned
helpers.wait_until_no_common_workers(workers_before, 4) -- respawned

proxy_client:close()
proxy_client = helpers.proxy_client()
Expand Down
2 changes: 1 addition & 1 deletion spec/kong_tests.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dedicated_config_processing = on
dns_hostsfile = spec/fixtures/hosts
resolver_hosts_file = spec/fixtures/hosts

nginx_main_worker_processes = 1
nginx_worker_processes = 1
nginx_main_worker_rlimit_nofile = 4096
nginx_events_worker_connections = 4096
nginx_events_multi_accept = off
Expand Down
Loading