RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-17 19:21:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: mux-h2: Don't add private connections in available connection list

Browse Source 
When a stream is detached from a backend private connection, we must not insert
it in the available connection list. In addition, we must be sure to remove it
from this list. To ensure it is properly performed, this part has been slightly
refactored to clearly split processing of private connections from the others.

This patch should probably be backported to 2.2.
This commit is contained in:
Christopher Faulet 2020-07-01 15:45:41 +02:00
parent e0e6aa5dda
commit c5579d18d1
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mux_h2.c
View File

@ -3945,25 +3945,32 @@ static void h2_detach(struct conn_stream *cs)
/* Never ever allow to reuse a connection from a non-reuse backend */ /* Never ever allow to reuse a connection from a non-reuse backend */
if ((h2c->proxy->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR) if ((h2c->proxy->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR)
h2c->conn->flags |= CO_FL_PRIVATE; h2c->conn->flags |= CO_FL_PRIVATE;
if (!h2c->conn->owner && (h2c->conn->flags & CO_FL_PRIVATE)) { if (h2c->conn->flags & CO_FL_PRIVATE) {
h2c->conn->owner = sess; if (!h2c->conn->owner) {
if (!session_add_conn(sess, h2c->conn, h2c->conn->target)) { h2c->conn->owner = sess;
h2c->conn->owner = NULL; if (!session_add_conn(sess, h2c->conn, h2c->conn->target)) {
if (eb_is_empty(&h2c->streams_by_id)) { h2c->conn->owner = NULL;
h2c->conn->mux->destroy(h2c); if (eb_is_empty(&h2c->streams_by_id)) {
TRACE_DEVEL("leaving on error after killing outgoing connection", H2_EV_STRM_END|H2_EV_H2C_ERR); h2c->conn->mux->destroy(h2c);
TRACE_DEVEL("leaving on error after killing outgoing connection", H2_EV_STRM_END|H2_EV_H2C_ERR);
return;
}
}
}
if (eb_is_empty(&h2c->streams_by_id) && h2c->conn->owner == sess) {
if (session_check_idle_conn(h2c->conn->owner, h2c->conn) != 0) {
/* At this point either the connection is destroyed, or it's been added to the server idle list, just stop */
TRACE_DEVEL("leaving without reusable idle connection", H2_EV_STRM_END);
return; return;
} }
} }
/* Be sure to remove the connection from the available_conns list */
if (!MT_LIST_ISEMPTY(&h2c->conn->list))
MT_LIST_DEL(&h2c->conn->list);
} }
if (eb_is_empty(&h2c->streams_by_id)) { else {
if (sess && h2c->conn->owner == sess && if (eb_is_empty(&h2c->streams_by_id)) {
session_check_idle_conn(h2c->conn->owner, h2c->conn) != 0) {
/* At this point either the connection is destroyed, or it's been added to the server idle list, just stop */
TRACE_DEVEL("leaving without reusable idle connection", H2_EV_STRM_END);
return;
}
if (!(h2c->conn->flags & CO_FL_PRIVATE)) {
if (!srv_add_to_idle_list(objt_server(h2c->conn->target), h2c->conn, 1)) { if (!srv_add_to_idle_list(objt_server(h2c->conn->target), h2c->conn, 1)) {
/* The server doesn't want it, let's kill the connection right away */ /* The server doesn't want it, let's kill the connection right away */
h2c->conn->mux->destroy(h2c); h2c->conn->mux->destroy(h2c);
@ -3978,9 +3985,10 @@ static void h2_detach(struct conn_stream *cs)
return; return;
} }
} else if (MT_LIST_ISEMPTY(&h2c->conn->list) && else if (MT_LIST_ISEMPTY(&h2c->conn->list) &&
h2_avail_streams(h2c->conn) > 0 && objt_server(h2c->conn->target)) { h2_avail_streams(h2c->conn) > 0 && objt_server(h2c->conn->target)) {
LIST_ADD(&__objt_server(h2c->conn->target)->available_conns[tid], mt_list_to_list(&h2c->conn->list)); LIST_ADD(&__objt_server(h2c->conn->target)->available_conns[tid], mt_list_to_list(&h2c->conn->list));
}
} }
} }
} }