RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: connections: Set idle_time before adding to idle list.

Browse Source 
In srv_add_to_idle_list(), make sure we set the idle_time before we add
the connection to an idle list, not after, otherwise another thread may
grab it, set the idle_time to 0, only to have the original thread set it
back to now_ms.
This may have an impact, as in conn_free() we check idle_time to decide
if we should decrement the idle connection counters for the server.
This commit is contained in:
Olivier Houchard 2020-03-22 19:59:52 +01:00
parent 3c49c1bd5c
commit dbda31939d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/server.h
View File

@ -262,6 +262,7 @@ static inline int srv_add_to_idle_list(struct server *srv, struct connection *co
return 0;
}
MT_LIST_DEL(&conn->list);
conn->idle_time = now_ms;
if (is_safe) {
conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_SAFE_LIST;
MT_LIST_ADDQ(&srv->safe_conns[tid], (struct mt_list *)&conn->list);
@ -273,7 +274,6 @@ static inline int srv_add_to_idle_list(struct server *srv, struct connection *co
}
_HA_ATOMIC_ADD(&srv->curr_idle_thr[tid], 1);
conn->idle_time = now_ms;
__ha_barrier_full();
if ((volatile void *)srv->idle_node.node.leaf_p == NULL) {
HA_SPIN_LOCK(OTHER_LOCK, &idle_conn_srv_lock);