mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: backend: add new conn to session if mux marked as HOL blocking

Browse Source 
When allocating a new session on connect_server, if the mux protocol is
marked as subject of HOL blocking, add it into session instead of
available list to avoid sharing it with other clients.
This commit is contained in:
Amaury Denoyelle 2020-10-14 18:17:08 +02:00 committed by Christopher Faulet
parent 04a24c5eaa
commit 00464ab8f4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend.c
View File

@ -1540,13 +1540,16 @@ int connect_server(struct stream *s)
/* If we're doing http-reuse always, and the connection is not /* If we're doing http-reuse always, and the connection is not
* private with available streams (an http2 connection), add it * private with available streams (an http2 connection), add it
* to the available list, so that others can use it right * to the available list, so that others can use it right
* away. If the connection is private, add it in the session * away. If the connection is private or we're doing http-reuse
* server list. * safe and the mux protocol supports multiplexing, add it in
* the session server list.
*/ */
if (srv && ((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_ALWS) && if (srv && ((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_ALWS) &&
!(srv_conn->flags & CO_FL_PRIVATE) && srv_conn->mux->avail_streams(srv_conn) > 0) !(srv_conn->flags & CO_FL_PRIVATE) && srv_conn->mux->avail_streams(srv_conn) > 0)
LIST_ADDQ(&srv->available_conns[tid], mt_list_to_list(&srv_conn->list)); LIST_ADDQ(&srv->available_conns[tid], mt_list_to_list(&srv_conn->list));
else if (srv_conn->flags & CO_FL_PRIVATE) { else if (srv_conn->flags & CO_FL_PRIVATE ||
((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_SAFE &&
srv_conn->mux->flags & MX_FL_HOL_RISK)) {
/* If it fail now, the same will be done in mux->detach() callback */ /* If it fail now, the same will be done in mux->detach() callback */
session_add_conn(srv_conn->owner, srv_conn, srv_conn->target); session_add_conn(srv_conn->owner, srv_conn, srv_conn->target);
} }