mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: mux-h2: try to clear DEM_MROOM and MUX_MFULL at more places

Browse Source 
The code leading to H2_CF_MUX_MFULL and H2_CF_DEM_MROOM being cleared
is quite complex and assumptions about its state are extremely difficult
when reading the code. There are indeed long sequences where the mux might
possibly be empty, still having the flag set until it reaches h2_send()
which will clear it after the last send. Even then it's not obviour whether
it's always guaranteed to release the flag when invoked in multiple passes.
Let's just simplify the conditionnn so that h2_send() does not depend on
"sent" anymore and that h2_timeout_task() doesn't leave the flags set on
the buffer on emptiness. While it doesn't seem to fix anything, it will
make the code more robust against future changes.
This commit is contained in:
Willy Tarreau 2024-09-02 15:14:16 +02:00
parent 0d4271cdae
commit e9cdedb39b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mux_h2.c
View File

@ -4321,7 +4321,7 @@ static int h2_send(struct h2c *h2c)
* data from the other side when it's known that this one is
* still congested.
*/
if (sent && br_single(h2c->mbuf))
if (br_single(h2c->mbuf))
h2c->flags &= ~(H2_CF_MUX_MFULL | H2_CF_DEM_MROOM);
}
@ -4672,6 +4672,12 @@ struct task *h2_timeout_task(struct task *t, void *context, unsigned int state)
offer_buffers(NULL, released);
}
/* Above we might have prepared a GOAWAY that was sent along with
* pending data, make sure to clear the FULL flags.
*/
if (br_single(h2c->mbuf))
h2c->flags &= ~(H2_CF_MUX_MFULL | H2_CF_DEM_MROOM);
/* in any case this connection must not be considered idle anymore */
if (h2c->conn->flags & CO_FL_LIST_MASK) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);