RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-09 03:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAJOR: stream-int: switch from SI_ST_CON to SI_ST_RDY on I/O

Browse Source 
Now whenever an I/O event succeeds during a connection attempt, we
switch the stream-int's state to SI_ST_RDY. This allows si_update()
to update R/W timeouts on the channel and end points to start to
consume outgoing data and to subscribe to lower layers in case of
failure. It also allows chk_rcv() to be performed on the other side
to enable data forwarding and make sure we don't fall into a situation
where no more events happen and nothing moves anymore.
This commit is contained in:
Willy Tarreau 2019-06-05 16:43:44 +02:00
parent 4f283fa604
commit b27f54a88c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/stream_interface.c
View File

@ -607,6 +607,8 @@ static int si_cs_process(struct conn_stream *cs)
(conn->flags & (CO_FL_CONNECTED | CO_FL_HANDSHAKE)) == CO_FL_CONNECTED) { (conn->flags & (CO_FL_CONNECTED | CO_FL_HANDSHAKE)) == CO_FL_CONNECTED) {
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
oc->flags |= CF_WRITE_NULL; oc->flags |= CF_WRITE_NULL;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
} }
/* Report EOI on the channel if it was reached from the mux point of /* Report EOI on the channel if it was reached from the mux point of
@ -656,6 +658,8 @@ int si_cs_send(struct conn_stream *cs)
if (ret > 0) { if (ret > 0) {
oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA; oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA;
did_send = 1; did_send = 1;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
} }
if (!oc->pipe->data) { if (!oc->pipe->data) {
@ -735,6 +739,8 @@ int si_cs_send(struct conn_stream *cs)
if (ret > 0) { if (ret > 0) {
did_send = 1; did_send = 1;
oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA; oc->flags |= CF_WRITE_PARTIAL | CF_WROTE_DATA;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
co_set_data(oc, co_data(oc) - ret); co_set_data(oc, co_data(oc) - ret);
c_realign_if_empty(oc); c_realign_if_empty(oc);
@ -1252,6 +1258,8 @@ int si_cs_recv(struct conn_stream *cs)
ic->total += ret; ic->total += ret;
cur_read += ret; cur_read += ret;
ic->flags |= CF_READ_PARTIAL; ic->flags |= CF_READ_PARTIAL;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
} }
if (cs->flags & CS_FL_EOS) if (cs->flags & CS_FL_EOS)
@ -1348,6 +1356,8 @@ int si_cs_recv(struct conn_stream *cs)
ic->flags |= CF_READ_PARTIAL; ic->flags |= CF_READ_PARTIAL;
ic->total += ret; ic->total += ret;
if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
if ((ic->flags & CF_READ_DONTWAIT) || --read_poll <= 0) { if ((ic->flags & CF_READ_DONTWAIT) || --read_poll <= 0) {
/* we're stopped by the channel's policy */ /* we're stopped by the channel's policy */
@ -1501,10 +1511,14 @@ static void stream_int_read0(struct stream_interface *si)
/* Don't change the state to SI_ST_DIS yet if we're still /* Don't change the state to SI_ST_DIS yet if we're still
* in SI_ST_CON, otherwise it means sess_establish() hasn't * in SI_ST_CON, otherwise it means sess_establish() hasn't
* been called yet, and so the analysers would not run. * been called yet, and so the analysers would not run. However
* it's fine to switch to SI_ST_RDY as we have really validated
* the connection.
*/ */
if (si->state == SI_ST_EST) if (si->state == SI_ST_EST)
si->state = SI_ST_DIS; si->state = SI_ST_DIS;
else if (si->state == SI_ST_CON)
si->state = SI_ST_RDY;
si->exp = TICK_ETERNITY; si->exp = TICK_ETERNITY;
return; return;
} }