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

BUG/MEDIUM: connections: Don't forget to decrement idle connection counters.

Browse Source 
In conn_backend_get(), when we manage to get an idle connection from the
current thread's pool, don't forget to decrement the idle connection
counters, or we may end up not reusing connections when we could, and/or
killing connections when we shouldn't.
This commit is contained in:
Olivier Houchard 2020-03-19 23:52:28 +01:00 committed by Olivier Houchard
parent b3397367dc
commit fdc7ee2173
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/backend.c
View File

@ -1095,8 +1095,10 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
/* If we found a connection in our own list, and we don't have to
* steal one from another thread, then we're done.
*/
if (conn)
return conn;
if (conn) {
i = tid;
goto fix_conn;
}
/* Lookup all other threads for an idle connection, starting from tid + 1 */
for (i = tid; !found && (i = ((i + 1 == global.nbthread) ? 0 : i + 1)) != tid;) {
@ -1116,6 +1118,7 @@ static struct connection *conn_backend_get(struct server *srv, int is_safe)
if (!found)
conn = NULL;
else {
fix_conn:
conn->idle_time = 0;
_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
_HA_ATOMIC_SUB(&srv->curr_idle_thr[i], 1);