mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 23:01:03 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: connections: Don't increase curr_used_conns for shared connections.

Browse Source 
In connect_server(), we want to increase curr_used_conns only if the
connection is new, or if it comes from an idle_pool, otherwise it means
the connection is already used by at least one another stream, and it is
already accounted for.
This commit is contained in:
Olivier Houchard 2020-06-28 16:14:09 +02:00
parent fc402cf3bc
commit 4ba494ca1b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend.c
View File

@ -1150,6 +1150,7 @@ int connect_server(struct stream *s)
int reuse_orphan = 0; int reuse_orphan = 0;
int init_mux = 0; int init_mux = 0;
int err; int err;
int was_unused = 0;
/* This will catch some corner cases such as lying connections resulting from /* This will catch some corner cases such as lying connections resulting from
@ -1208,17 +1209,20 @@ int connect_server(struct stream *s)
s->txn && (s->txn->flags & TX_NOT_FIRST)) && s->txn && (s->txn->flags & TX_NOT_FIRST)) &&
srv->curr_idle_nb > 0) { srv->curr_idle_nb > 0) {
srv_conn = conn_backend_get(srv, 0); srv_conn = conn_backend_get(srv, 0);
was_unused = 1;
} }
else if (srv->safe_conns && else if (srv->safe_conns &&
((s->txn && (s->txn->flags & TX_NOT_FIRST)) || ((s->txn && (s->txn->flags & TX_NOT_FIRST)) ||
(s->be->options & PR_O_REUSE_MASK) >= PR_O_REUSE_AGGR) && (s->be->options & PR_O_REUSE_MASK) >= PR_O_REUSE_AGGR) &&
srv->curr_safe_nb > 0) { srv->curr_safe_nb > 0) {
srv_conn = conn_backend_get(srv, 1); srv_conn = conn_backend_get(srv, 1);
was_unused = 1;
} }
else if (srv->idle_conns && else if (srv->idle_conns &&
((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_ALWS) && ((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_ALWS) &&
srv->curr_idle_nb > 0) { srv->curr_idle_nb > 0) {
srv_conn = conn_backend_get(srv, 0); srv_conn = conn_backend_get(srv, 0);
was_unused = 1;
} }
/* If we've picked a connection from the pool, we now have to /* If we've picked a connection from the pool, we now have to
* detach it. We may have to get rid of the previous idle * detach it. We may have to get rid of the previous idle
@ -1340,12 +1344,13 @@ int connect_server(struct stream *s)
/* no reuse or failed to reuse the connection above, pick a new one */ /* no reuse or failed to reuse the connection above, pick a new one */
if (!srv_conn) { if (!srv_conn) {
srv_conn = conn_new(); srv_conn = conn_new();
was_unused = 1;
if (srv_conn) if (srv_conn)
srv_conn->target = s->target; srv_conn->target = s->target;
srv_cs = NULL; srv_cs = NULL;
} }
if (srv_conn && srv) { if (srv_conn && srv && was_unused) {
_HA_ATOMIC_ADD(&srv->curr_used_conns, 1); _HA_ATOMIC_ADD(&srv->curr_used_conns, 1);
/* It's ok not to do that atomically, we don't need an /* It's ok not to do that atomically, we don't need an
* exact max. * exact max.