BUG/MEDIUM: checks: Destroy the conn-stream before the session
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.
diff --git a/src/checks.c b/src/checks.c
index 414c39e..d17302a 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -2350,7 +2350,7 @@
/* 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 @@
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 @@
/* 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 @@
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 */