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

BUG/MEDIUM: checks: Destroy the conn-stream before the session

Browse Source 
At the end of a tcp-check based health check, if there is still a connection
attached to the check, it must be closed. But it must be done before releasing
the session, because the session may still be referenced by the mux. For
instance, an h2 stream may still have a reference on the session.

No need to backport.
This commit is contained in:
Christopher Faulet 2020-04-27 15:59:22 +02:00
parent bfb0f72d52
commit b693a0de37
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/checks.c
View File

@ -2350,7 +2350,7 @@ static int tcpcheck_main(struct check *check)
/* here, we know that the check is complete or that it failed */
if (check->result != CHK_RES_UNKNOWN)
goto out_end_tcpcheck;
goto out;
/* 1- check for connection error, if any */
if ((conn && conn->flags & CO_FL_ERROR) || (cs && cs->flags & CS_FL_ERROR))
@ -2526,13 +2526,6 @@ static int tcpcheck_main(struct check *check)
if ((conn && conn->flags & CO_FL_ERROR) || (cs && cs->flags & CS_FL_ERROR))
chk_report_conn_err(check, errno, 0);
/* cleanup before leaving */
check->current_step = NULL;
if (check->sess != NULL) {
vars_prune(&check->vars, check->sess, NULL);
session_free(check->sess);
check->sess = NULL;
}
out:
return retcode;
}
@ -3316,10 +3309,6 @@ static struct task *process_chk_conn(struct task *t, void *context, unsigned sho
/* check complete or aborted */
check->current_step = NULL;
if (check->sess != NULL) {
session_free(check->sess);
check->sess = NULL;
}
if (conn && conn->xprt) {
/* The check was aborted and the connection was not yet closed.
@ -3344,6 +3333,12 @@ static struct task *process_chk_conn(struct task *t, void *context, unsigned sho
conn = NULL;
}
if (check->sess != NULL) {
vars_prune(&check->vars, check->sess, NULL);
session_free(check->sess);
check->sess = NULL;
}
if (check->server) {
if (check->result == CHK_RES_FAILED) {
/* a failure or timeout detected */