RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-24 13:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: peers: Balance applets across threads

Browse Source 
When creating a new applet for peer outgoing connection, we check
the load on each thread. Threads with least applet count are
preferred.

With this solution we avoid a situation when many outgoing
connections run on the same thread causing significant load on
single CPU core.
This commit is contained in:
Maciej Zdeb 2022-05-16 17:27:28 +02:00 committed by Christopher Faulet
parent d01be2ab13
commit 34e4085f8a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/peers.c
View File

@ -3196,7 +3196,8 @@ void peers_setup_frontend(struct proxy *fe)
static struct appctx *peer_session_create(struct peers *peers, struct peer *peer) static struct appctx *peer_session_create(struct peers *peers, struct peer *peer)
{ {
struct appctx *appctx; struct appctx *appctx;
unsigned int thr = tid; unsigned int thr = 0;
int idx;
peer->new_conn++; peer->new_conn++;
peer->reconnect = tick_add(now_ms, MS_TO_TICKS(PEER_RECONNECT_TIMEOUT)); peer->reconnect = tick_add(now_ms, MS_TO_TICKS(PEER_RECONNECT_TIMEOUT));
@ -3204,7 +3205,9 @@ static struct appctx *peer_session_create(struct peers *peers, struct peer *peer
peer->statuscode = PEER_SESS_SC_CONNECTCODE; peer->statuscode = PEER_SESS_SC_CONNECTCODE;
peer->last_hdshk = now_ms; peer->last_hdshk = now_ms;
appctx = appctx_new_here(&peer_applet, NULL); for (idx = 0; idx < global.nbthread; idx++)
thr = peers->applet_count[idx] < peers->applet_count[thr] ? idx : thr;
appctx = appctx_new_on(&peer_applet, NULL, thr);
if (!appctx) if (!appctx)
goto out_close; goto out_close;
appctx->svcctx = (void *)peer; appctx->svcctx = (void *)peer;
@ -3212,10 +3215,8 @@ static struct appctx *peer_session_create(struct peers *peers, struct peer *peer
appctx->st0 = PEER_SESS_ST_CONNECT; appctx->st0 = PEER_SESS_ST_CONNECT;
peer->appctx = appctx; peer->appctx = appctx;
if (appctx_init(appctx) == -1)
goto out_free_appctx;
HA_ATOMIC_INC(&peers->applet_count[thr]); HA_ATOMIC_INC(&peers->applet_count[thr]);
appctx_wakeup(appctx);
return appctx; return appctx;
/* Error unrolling */ /* Error unrolling */