mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: config: remove support for deprecated option "tune.chksize"

Browse Source 
It was marked as deprecated for immediate removal as it was not used,
let's reject it and remove it from the doc. A specific error suggests
to check tune.bufsize instead.
This commit is contained in:
Willy Tarreau 2021-06-11 15:29:31 +02:00
parent 85af93b8c7
commit eb9d90a5a2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/configuration.txt
View File

@ -1055,7 +1055,6 @@ The following keywords are supported in the "global" section :
- tune.buffers.limit - tune.buffers.limit
- tune.buffers.reserve - tune.buffers.reserve
- tune.bufsize - tune.bufsize
- tune.chksize
- tune.comp.maxlevel - tune.comp.maxlevel
- tune.fd.edge-triggered - tune.fd.edge-triggered
- tune.h2.header-table-size - tune.h2.header-table-size
@ -2431,9 +2430,6 @@ tune.bufsize <number>
value set using this parameter will automatically be rounded up to the next value set using this parameter will automatically be rounded up to the next
multiple of 8 on 32-bit machines and 16 on 64-bit machines. multiple of 8 on 32-bit machines and 16 on 64-bit machines.
tune.chksize <number> (deprecated)
This option is deprecated and ignored.
tune.comp.maxlevel <number> tune.comp.maxlevel <number>
Sets the maximum compression level. The compression level affects CPU Sets the maximum compression level. The compression level affects CPU
usage during compression. This value affects CPU usage during compression. usage during compression. This value affects CPU usage during compression.

7
src/cfgparse-global.c
View File

@ -32,7 +32,7 @@ static const char *common_kw_list[] = {
"insecure-fork-wanted", "insecure-setuid-wanted", "nosplice", "insecure-fork-wanted", "insecure-setuid-wanted", "nosplice",
"nogetaddrinfo", "noreuseport", "quiet", "zero-warning", "nogetaddrinfo", "noreuseport", "quiet", "zero-warning",
"tune.runqueue-depth", "tune.maxpollevents", "tune.maxaccept", "tune.runqueue-depth", "tune.maxpollevents", "tune.maxaccept",
"tune.chksize", "tune.recv_enough", "tune.buffers.limit", "tune.recv_enough", "tune.buffers.limit",
"tune.buffers.reserve", "tune.bufsize", "tune.maxrewrite", "tune.buffers.reserve", "tune.bufsize", "tune.maxrewrite",
"tune.idletimer", "tune.rcvbuf.client", "tune.rcvbuf.server", "tune.idletimer", "tune.rcvbuf.client", "tune.rcvbuf.server",
"tune.sndbuf.client", "tune.sndbuf.server", "tune.pipesize", "tune.sndbuf.client", "tune.sndbuf.server", "tune.pipesize",
@ -224,8 +224,9 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
global.tune.maxaccept = max; global.tune.maxaccept = max;
} }
else if (strcmp(args[0], "tune.chksize") == 0) { else if (strcmp(args[0], "tune.chksize") == 0) {
ha_warning("parsing [%s:%d]: the option '%s' is deprecated and will be removed in next version.\n", ha_alert("parsing [%s:%d]: option '%s' is not supported any more (tune.bufsize is used instead).\n", file, linenum, args[0]);
file, linenum, args[0]); err_code |= ERR_ALERT | ERR_FATAL;
goto out;
} }
else if (strcmp(args[0], "tune.recv_enough") == 0) { else if (strcmp(args[0], "tune.recv_enough") == 0) {
if (alertif_too_many_args(1, file, linenum, args, &err_code)) if (alertif_too_many_args(1, file, linenum, args, &err_code))