From 9a301c3b5ab3574e3836081a02b64be1558a2176 Mon Sep 17 00:00:00 2001 From: Xiaochen Wang Date: Tue, 27 Feb 2024 13:20:51 +0800 Subject: [PATCH 1/2] fix(conf): fix the default value of upstream_keepalive_max_requests (#12643) This commit fixes the discrepancy between the default value of upstream_keepalive_max_requests in the Kong.conf comments and the actual value in kong/templates/kong_defaults.lua. (cherry picked from commit c5ed954e4ce517956173eaa860b6344d2a6cd06c) --- .../fix-default-value-of-upstream-keepalive-max-requests.yml | 5 +++++ kong.conf.default | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml diff --git a/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml b/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml new file mode 100644 index 00000000000..45eedd995d6 --- /dev/null +++ b/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml @@ -0,0 +1,5 @@ +message: | + Fixed default value in kong.conf.default documentation from 1000 to 10000 + for upstream_keepalive_max_requests option. +type: bugfix +scope: Configuration diff --git a/kong.conf.default b/kong.conf.default index aa2d0810e49..70166f6e679 100644 --- a/kong.conf.default +++ b/kong.conf.default @@ -1016,7 +1016,7 @@ # each upstream request to open a new # connection. -#upstream_keepalive_max_requests = 1000 # Sets the default maximum number of +#upstream_keepalive_max_requests = 10000 # Sets the default maximum number of # requests than can be proxied upstream # through one keepalive connection. # After the maximum number of requests From 54d7e20c0a9ed207dabfea6f43fd19f46dbb3849 Mon Sep 17 00:00:00 2001 From: Xiaochen Wang Date: Wed, 28 Feb 2024 10:27:47 +0800 Subject: [PATCH 2/2] remove unnecessary changelog --- .../fix-default-value-of-upstream-keepalive-max-requests.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml diff --git a/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml b/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml deleted file mode 100644 index 45eedd995d6..00000000000 --- a/changelog/unreleased/kong/fix-default-value-of-upstream-keepalive-max-requests.yml +++ /dev/null @@ -1,5 +0,0 @@ -message: | - Fixed default value in kong.conf.default documentation from 1000 to 10000 - for upstream_keepalive_max_requests option. -type: bugfix -scope: Configuration