mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: stconn: Sanitize report for read activity

Browse Source 
When a EOS or EOI is detected on the endpoint and when the event is reported
at the SC level, a read activity must be reported. It is not really a big
deal because these flags already inhibit any read timeout. But it is
consistent with the <lra> comment. In addition, no read activity is reported
on abort. It is up-down event and it is not an event unblocking the
reads. So there is no reason to report a read activity.

This patch must be backported to 2.8.
This commit is contained in:
Christopher Faulet 2023-11-07 07:45:43 +01:00
parent d247152ec2
commit c57af8ebcd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stconn.c
View File

@ -558,7 +558,6 @@ static void sc_app_abort(struct stconn *sc)
sc->flags |= SC_FL_ABRT_DONE;
ic->flags |= CF_READ_EVENT;
sc_ep_report_read_activity(sc);
if (!sc_state_in(sc->state, SC_SB_CON|SC_SB_RDY|SC_SB_EST))
return;
@ -1361,6 +1360,7 @@ static int sc_conn_recv(struct stconn *sc)
* cannot be xferred to the channel
*/
ic->flags |= CF_READ_EVENT;
sc_ep_report_read_activity(sc);
}
if (ret <= 0) {
@ -1829,6 +1829,7 @@ static int sc_conn_process(struct stconn *sc)
if (sc_ep_test(sc, SE_FL_EOI) && !(sc->flags & SC_FL_EOI)) {
sc->flags |= SC_FL_EOI;
ic->flags |= CF_READ_EVENT;
sc_ep_report_read_activity(sc);
}
if (sc_ep_test(sc, SE_FL_ERROR))
@ -1882,6 +1883,7 @@ static void sc_applet_eos(struct stconn *sc)
return;
sc->flags |= SC_FL_EOS;
ic->flags |= CF_READ_EVENT;
sc_ep_report_read_activity(sc);
/* Note: on abort, we don't call the applet */