mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: limits: add is_any_limit_configured

Browse Source 
Let's encapsulate the check of all supported for now process internal limits in
a separate function. This will help in cases, when we need to simply check if
we have even only one limit set in the configuration file. It's important, as
the default value for a one limit (fd-hard-limits, for example) sometimes must
not affect the computation of the others.
This commit is contained in:
Valentine Krasnobaeva 2024-07-10 14:18:12 +02:00 committed by Willy Tarreau
parent 1f8addfdc2
commit 3a0b44b122
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/limits.c
View File

@ -41,6 +41,21 @@ int raise_rlim_nofile(struct rlimit *old_limit, struct rlimit *new_limit)
return ret;
}
/* Encapsulates the check of all supported for now process internal limits,
* which could be provided via config or/and cmdline. Returns 1, if even only
* one supported limit is set, otherwise 0.
*/
static int is_any_limit_configured()
{
int ret = 0;
if (global.maxconn || global.rlimit_nofile || global.rlimit_memmax ||
global.fd_hard_limit)
ret = 1;
return ret;
}
/* considers splicing proxies' maxconn, computes the ideal global.maxpipes
* setting, and returns it. It may return -1 meaning "unlimited" if some
* unlimited proxies have been found and the global.maxconn value is not yet
@ -134,8 +149,7 @@ int compute_ideal_maxconn()
* if only one of these ha-specific limits is presented in config or in
* the cmdline.
*/
if (!global.fd_hard_limit && !global.maxconn && !global.rlimit_nofile
&& !global.rlimit_memmax)
if (!is_any_limit_configured())
global.fd_hard_limit = DEFAULT_MAXFD;
if (remain > global.fd_hard_limit)