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/MEDIUM: stream: Stop waiting for more data if SI is blocked on RXBLK_ROOM

Browse Source 
If the stream-interface is waiting for more buffer room to store incoming
data, it is important at the stream level to stop to wait for more data to
continue. Thanks to the previous patch ("BUG/MEDIUM: stream-int: Notify
stream that the mux wants more room to xfer data"), the stream is woken up
when this happens. In this patch, we take care to interrupt the
corresponding tcp-content ruleset or to stop waiting for the HTTP message
payload.

To ease detection of the state, si_rx_blocked_room() helper function has
been added. It returns non-zero if the stream interface's Rx path is blocked
because of lack of room in the input buffer.

This patch is part of a series related to the issue #1362. It should be
backported as ar as 2.0, probably with some adaptations. So be careful
during backports.
This commit is contained in:
Christopher Faulet 2021-09-23 14:46:32 +02:00
parent df99408e0d
commit 7833596ff4
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/haproxy/stream_interface.h
View File

@ -242,6 +242,15 @@ static inline int si_rx_blocked(const struct stream_interface *si)
return !!(si->flags & SI_FL_RXBLK_ANY);
}
/* Returns non-zero if the stream interface's Rx path is blocked because of lack
* of room in the input buffer.
*/
static inline int si_rx_blocked_room(const struct stream_interface *si)
{
return !!(si->flags & SI_FL_RXBLK_ROOM);
}
/* Returns non-zero if the stream interface's endpoint is ready to receive */
static inline int si_rx_endp_ready(const struct stream_interface *si)
{

6
src/http_ana.c
View File

@ -4060,8 +4060,10 @@ enum rule_result http_wait_for_msg_body(struct stream *s, struct channel *chn,
/* Now we're in HTTP_MSG_DATA. We just need to know if all data have
* been received or if the buffer is full.
*/
if ((htx->flags & HTX_FL_EOM) || htx_get_tail_type(htx) > HTX_BLK_DATA ||
channel_htx_full(chn, htx, global.tune.maxrewrite))
if ((htx->flags & HTX_FL_EOM) ||
htx_get_tail_type(htx) > HTX_BLK_DATA ||
channel_htx_full(chn, htx, global.tune.maxrewrite) ||
si_rx_blocked_room(chn_prod(chn)))
goto end;
if (bytes) {

2
src/tcp_rules.c
View File

@ -113,6 +113,7 @@ int tcp_inspect_request(struct stream *s, struct channel *req, int an_bit)
*/
if ((req->flags & CF_SHUTR) || channel_full(req, global.tune.maxrewrite) ||
si_rx_blocked_room(chn_prod(req)) ||
!s->be->tcp_req.inspect_delay || tick_is_expired(s->rules_exp, now_ms))
partial = SMP_OPT_FINAL;
else
@ -268,6 +269,7 @@ int tcp_inspect_response(struct stream *s, struct channel *rep, int an_bit)
* - if one rule returns KO, then return KO
*/
if ((rep->flags & CF_SHUTR) || channel_full(rep, global.tune.maxrewrite) ||
si_rx_blocked_room(chn_prod(rep)) ||
!s->be->tcp_rep.inspect_delay || tick_is_expired(s->rules_exp, now_ms))
partial = SMP_OPT_FINAL;
else