RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-18 19:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: stream-int: Notify stream that the mux wants more room to xfer data

Browse Source 
When the mux failed to transfer data to the upper layer because of a lack of
room, it is important to wake the stream up to let it handle this
event. Otherwise, if the stream is waiting for more data, both the stream
and the mux reamin blocked waiting for each other.

When this happens, the mux set the CS_FL_WANT_ROOM flag on the
conn-stream. Thus, in si_cs_recv() we are able to detect this event. Today,
the stream-interface is blocked. But, it is not enough to wake the stream
up. To fix the bug, CF_READ_PARTIAL flag is extended to also handle cases
where a read exception occurred. This flag should idealy be renamed. But for
now, it is good enough. By setting this flag, we are sure the stream will be
woken up.

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

2
include/haproxy/channel-t.h
View File

@ -52,7 +52,7 @@
*/
#define CF_READ_NULL 0x00000001 /* last read detected on producer side */
#define CF_READ_PARTIAL 0x00000002 /* some data were read from producer */
#define CF_READ_PARTIAL 0x00000002 /* some data were read from producer or a read exception occurred */
#define CF_READ_TIMEOUT 0x00000004 /* timeout while waiting for producer */
#define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */
#define CF_READ_ACTIVITY (CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ERROR)

7
src/stream_interface.c
View File

@ -1351,8 +1351,13 @@ int si_cs_recv(struct conn_stream *cs)
flags |= ((!conn_is_back(conn) && (si_strm(si)->be->options & PR_O_ABRT_CLOSE)) ? CO_RFL_KEEP_RECV : 0);
ret = cs->conn->mux->rcv_buf(cs, &ic->buf, max, flags | (co_data(ic) ? CO_RFL_BUF_WET : 0));
if (cs->flags & CS_FL_WANT_ROOM)
if (cs->flags & CS_FL_WANT_ROOM) {
si_rx_room_blk(si);
/* Add READ_PARTIAL because some data are pending but
* cannot be xferred to the channel
*/
ic->flags |= CF_READ_PARTIAL;
}
if (ret <= 0) {
/* if we refrained from reading because we asked for a