1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: server: perform lbprm deinit for dynamic servers

Browse Source 
Last commit 7361515 ("BUG/MINOR: server: dont depend on proxy for server
cleanup in srv_drop()") introduced a regression because the lbprm
server_deinit is not evaluated anymore with dynamic servers, possibly
resulting in a memory leak.

To fix the issue, in addition to free_proxy(), the server deinit check
should be manually performed in cli_parse_delete_server() as well.

No backport needed.
This commit is contained in:
Aurelien DARRAGON 2025-05-12 16:27:43 +02:00
parent 736151556c
commit c40d6ac840
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server.c
View File

@ -6276,6 +6276,9 @@ static int cli_parse_delete_server(char **args, char *payload, struct appctx *ap
if (srv->agent.state & CHK_ST_CONFIGURED) if (srv->agent.state & CHK_ST_CONFIGURED)
check_purge(&srv->agent); check_purge(&srv->agent);
if (srv->proxy->lbprm.server_deinit)
srv->proxy->lbprm.server_deinit(srv);
while (!MT_LIST_ISEMPTY(&srv->watcher_list)) { while (!MT_LIST_ISEMPTY(&srv->watcher_list)) {
srv_watch = MT_LIST_NEXT(&srv->watcher_list, struct watcher *, el); srv_watch = MT_LIST_NEXT(&srv->watcher_list, struct watcher *, el);
BUG_ON(srv->next && srv->next->flags & SRV_F_DELETED); BUG_ON(srv->next && srv->next->flags & SRV_F_DELETED);