upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 06:37:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

MEDIUM: bwlim: Use a read-lock on the sticky session to apply a shared limit

Browse source 
There is no reason to acquire a write-lock on the sticky session when a
shared limit is applied because only the frequency is updated. The sticky
session itself is not modified. We must just take care it is not removed in
the mean time. So a read-lock may be used instead.
This commit is contained in:
Christopher Faulet 2024-08-28 10:04:42 +02:00
parent a7f6b0ac03
commit f9adcdf039
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/flt_bwlim.c
View file

@ -106,7 +106,7 @@ static int bwlim_apply_limit(struct filter *filter, struct channel *chn, unsigne
if (!ptr)
goto end;
HA_RWLOCK_WRLOCK(STK_SESS_LOCK, &st->ts->lock);
HA_RWLOCK_RDLOCK(STK_SESS_LOCK, &st->ts->lock);
bytes_rate = &stktable_data_cast(ptr, std_t_frqp);
period = conf->table.t->data_arg[type].u;
limit = conf->limit;
@ -137,7 +137,7 @@ static int bwlim_apply_limit(struct filter *filter, struct channel *chn, unsigne
overshoot = freq_ctr_overshoot_period(bytes_rate, period, limit);
if (overshoot > 0) {
if (conf->flags & BWLIM_FL_SHARED)
HA_RWLOCK_WRUNLOCK(STK_SESS_LOCK, &st->ts->lock);
HA_RWLOCK_RDUNLOCK(STK_SESS_LOCK, &st->ts->lock);
wait = div64_32((uint64_t)(conf->min_size + overshoot) * period * users,
limit);
st->exp = tick_add(now_ms, (wait ? wait : 1));
@ -178,7 +178,7 @@ static int bwlim_apply_limit(struct filter *filter, struct channel *chn, unsigne
}
if (conf->flags & BWLIM_FL_SHARED)
HA_RWLOCK_WRUNLOCK(STK_SESS_LOCK, &st->ts->lock);
HA_RWLOCK_RDUNLOCK(STK_SESS_LOCK, &st->ts->lock);
end:
chn->analyse_exp = tick_first((tick_is_expired(chn->analyse_exp, now_ms) ? TICK_ETERNITY : chn->analyse_exp),