RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-12 08:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: server-state: Don't load server-state file for disabled backends

Browse Source 
Recent changes on the server-state file loading have introduced a
regression. HAproxy crashes if a backend with no server-state file is
disabled in the configuration. Indeed, configuration of such backends is not
finalized. Thus many fields are not defined.

To fix the bug, disabled backends must be ignored. In addition a BUG_ON()
has been added to verify the proxy mode regarding the server-state file. It
must be specified (none, global or local) for enabled backends.

No backport needed.
This commit is contained in:
Christopher Faulet 2021-03-04 16:35:26 +01:00
parent 2ec4e3c1ac
commit 6f69110191
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server_state.c
View File

@ -815,10 +815,13 @@ void apply_server_state(void)
for (curproxy = proxies_list; curproxy != NULL; curproxy = curproxy->next) {
struct eb_root local_state_tree = EB_ROOT_UNIQUE;
/* servers are only in backends */
if (!(curproxy->cap & PR_CAP_BE) || !curproxy->srv)
/* Must be an enabled backend with at least a server */
if (!(curproxy->cap & PR_CAP_BE) || curproxy->disabled || !curproxy->srv)
continue; /* next proxy */
/* Mode must be specified */
BUG_ON(curproxy->load_server_state_from_file == PR_SRV_STATE_FILE_UNSPEC);
/* No server-state file for this proxy */
if (curproxy->load_server_state_from_file == PR_SRV_STATE_FILE_NONE)
continue; /* next proxy */