RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-05 03:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cfgparse/server: move (min/max)conn postparsing logic into dedicated function

Browse Source 
In check_config_validity() function, we performed some consistency checks to
adjust minconn/maxconn attributes for each declared server.

We move this logic into a dedicated function named srv_minmax_conn_apply()
to be able to perform those checks later in the process life when needed
(ie: dynamic servers)
This commit is contained in:
Aurelien DARRAGON 2023-02-08 11:49:02 +01:00 committed by Amaury Denoyelle
parent a14686d096
commit 3e7a0bb70b
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/haproxy/server.h
View File

@ -281,6 +281,26 @@ static inline void srv_use_conn(struct server *srv, struct connection *conn)
HA_ATOMIC_STORE(&srv->est_need_conns, curr);
}
/* checks if minconn and maxconn are consistent to each other
* and automatically adjust them if it is not the case
* This logic was historically implemented in check_config_validity()
* at boot time, but with the introduction of dynamic servers
* this may be used at multiple places in the code now
*/
static inline void srv_minmax_conn_apply(struct server *srv)
{
if (srv->minconn > srv->maxconn) {
/* Only 'minconn' was specified, or it was higher than or equal
* to 'maxconn'. Let's turn this into maxconn and clean it, as
* this will avoid further useless expensive computations.
*/
srv->maxconn = srv->minconn;
} else if (srv->maxconn && !srv->minconn) {
/* minconn was not specified, so we set it to maxconn */
srv->minconn = srv->maxconn;
}
}
#endif /* _HAPROXY_SERVER_H */
/*

11
src/cfgparse.c
View File

@ -3818,16 +3818,7 @@ out_uri_auth_compat:
while (newsrv != NULL) {
set_usermsgs_ctx(newsrv->conf.file, newsrv->conf.line, &newsrv->obj_type);
if (newsrv->minconn > newsrv->maxconn) {
/* Only 'minconn' was specified, or it was higher than or equal
* to 'maxconn'. Let's turn this into maxconn and clean it, as
* this will avoid further useless expensive computations.
*/
newsrv->maxconn = newsrv->minconn;
} else if (newsrv->maxconn && !newsrv->minconn) {
/* minconn was not specified, so we set it to maxconn */
newsrv->minconn = newsrv->maxconn;
}
srv_minmax_conn_apply(newsrv);
/* this will also properly set the transport layer for
* prod and checks