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

MINOR: checks: use cs_drain_and_close() instead of draining the connection

Browse Source 
As explained in previous commit, the situation is absurd as we try to
cleanly drain pending data before impolitely shutting down, and it could
be counter productive on real muxes. Let's use cs_drain_and_close() instead.
This commit is contained in:
Willy Tarreau 2020-12-11 11:09:29 +01:00
parent 7d7b11cf93
commit 30bd4efb1b
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/check.c
View File

@ -797,8 +797,7 @@ static int wake_srv_chk(struct conn_stream *cs)
/* Check complete or aborted. If connection not yet closed do it
* now and wake the check task up to be sure the result is
* handled ASAP. */
conn_sock_drain(conn);
cs_close(cs);
cs_drain_and_close(cs);
ret = -1;
/* We may have been scheduled to run, and the
* I/O handler expects to have a cs, so remove
@ -899,8 +898,7 @@ static struct task *process_chk_conn(struct task *t, void *context, unsigned sho
* as a failed response coupled with "observe layer7" caused the
* server state to be suddenly changed.
*/
conn_sock_drain(conn);
cs_close(cs);
cs_drain_and_close(cs);
}
if (cs) {