upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 23:02:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

MEDIUM: connections: Wait until the connection is established to try to recv.

Browse source 
Instead of trying to receive as soon as the connection is created, and to
eventually have to transfer subscription if we move connections, wait
until the connection is established before attempting to recv.
This commit is contained in:
Olivier Houchard 2018-11-07 17:55:19 +01:00 committed by Willy Tarreau
parent db398435aa
commit 47e9a1ad4e
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/backend.c
View file

@ -1061,16 +1061,12 @@ int connect_server(struct stream *s)
struct server *srv;
int reuse = 0;
int err;
void *send_wait = NULL, *recv_wait = NULL;
srv = objt_server(s->target);
srv_cs = objt_cs(s->si[1].end);
srv_conn = cs_conn(srv_cs);
if (srv_conn) {
if (srv_conn)
reuse = s->target == srv_conn->target;
send_wait = srv_conn->send_wait;
recv_wait = srv_conn->recv_wait;
}
if (srv && !reuse) {
old_cs = srv_cs;
@ -1171,9 +1167,6 @@ int connect_server(struct stream *s)
if (!srv_cs)
return SF_ERR_RESOURCE;
srv_conn->send_wait = send_wait;
srv_conn->recv_wait = recv_wait;
if (!(s->flags & SF_ADDR_SET)) {
err = assign_server_address(s);
if (err != SRV_STATUS_OK)

6
src/stream.c
View file

@ -862,6 +862,12 @@ static void sess_establish(struct stream *s)
/* real connections have timeouts */
req->wto = s->be->timeout.server;
rep->rto = s->be->timeout.server;
/* The connection is now established, try to read data from the
* underlying layer, and subscribe to recv events. We use a
* delayed recv here to give a chance to the data to flow back
* by the time we process other tasks.
*/
si_chk_rcv(si);
}
req->wex = TICK_ETERNITY;
}