RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-20 12:46:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: servers: Add a counter for the number of currently used connections.

Browse Source 
Add a counter to know the current number of used connections, as well as the
max, this will be used later to refine the algorithm used to kill idle
connections, based on current usage.
This commit is contained in:
Olivier Houchard 2020-03-25 19:41:03 +01:00
parent 824186bb08
commit cf612a0457
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/proto/connection.h
View File

@ -479,6 +479,11 @@ static inline void conn_free(struct connection *conn)
_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
_HA_ATOMIC_SUB(conn->flags & CO_FL_SAFE_LIST ? &srv->curr_safe_nb : &srv->curr_idle_nb, 1);
_HA_ATOMIC_SUB(&srv->curr_idle_thr[tid], 1);
} else {
struct server *srv = objt_server(conn->target);
if (srv)
_HA_ATOMIC_SUB(&srv->curr_used_conns, 1);
}
conn_force_unsubscribe(conn);

1
include/proto/server.h
View File

@ -261,6 +261,7 @@ static inline int srv_add_to_idle_list(struct server *srv, struct connection *co
_HA_ATOMIC_SUB(&srv->curr_idle_conns, 1);
return 0;
}
_HA_ATOMIC_SUB(&srv->curr_used_conns, 1);
MT_LIST_DEL(&conn->list);
conn->idle_time = now_ms;
if (is_safe) {

2
include/types/server.h
View File

@ -230,6 +230,8 @@ struct server {
unsigned int curr_idle_conns; /* Current number of orphan idling connections, both the idle and the safe lists */
unsigned int curr_idle_nb; /* Current number of connections in the idle list */
unsigned int curr_safe_nb; /* Current number of connections in the safe list */
unsigned int curr_used_conns; /* Current number of used connections */
unsigned int max_used_conns; /* Max number of used connections (the counter is resetted at each connection purges */
unsigned int *curr_idle_thr; /* Current number of orphan idling connections per thread */
int max_reuse; /* Max number of requests on a same connection */
struct eb32_node idle_node; /* When to next do cleanup in the idle connections */

8
src/backend.c
View File

@ -1350,6 +1350,14 @@ int connect_server(struct stream *s)
srv_cs = NULL;
}
if (srv_conn && srv) {
_HA_ATOMIC_ADD(&srv->curr_used_conns, 1);
/* It's ok not to do that atomically, we don't need an
* exact max.
*/
if (srv->max_used_conns < srv->curr_used_conns)
srv->max_used_conns = srv->curr_used_conns;
}
if (!srv_conn || !sockaddr_alloc(&srv_conn->dst)) {
if (srv_conn)
conn_free(srv_conn);