mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: checks: Make sure we unsubscribe before calling cs_destroy().

Browse Source 
When we want to destroy the conn_stream for some reason, usually on error,
make sure we unsubscribed before doing so. If we subsscribed, the xprt may
ultimately wake our tasklet on close, aand the check tasklet doesn't expect
it ot happen when we have no longer any conn_stream.
This commit is contained in:
Olivier Houchard 2019-05-31 19:20:36 +02:00 committed by Olivier Houchard
parent 14fcc2ebcc
commit 49065544d0
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/checks.c
View File

@ -2243,6 +2243,16 @@ static struct task *process_chk_conn(struct task *t, void *context, unsigned sho
/* here, we have seen a synchronous error, no fd was allocated */
if (cs) {
if (check->wait_list.events)
cs->conn->xprt->unsubscribe(cs->conn,
cs->conn->xprt_ctx,
check->wait_list.events,
&check->wait_list);
/* We may have been scheduled to run, and the
* I/O handler expects to have a cs, so remove
* the tasklet
*/
task_remove_from_tasklet_list((struct task *)check->wait_list.task);
cs_destroy(cs);
cs = check->cs = NULL;
conn = NULL;
@ -2297,6 +2307,16 @@ static struct task *process_chk_conn(struct task *t, void *context, unsigned sho
}
if (cs) {
if (check->wait_list.events)
cs->conn->xprt->unsubscribe(cs->conn,
cs->conn->xprt_ctx,
check->wait_list.events,
&check->wait_list);
/* We may have been scheduled to run, and the
* I/O handler expects to have a cs, so remove
* the tasklet
*/
task_remove_from_tasklet_list((struct task *)check->wait_list.task);
cs_destroy(cs);
cs = check->cs = NULL;
conn = NULL;
@ -2803,8 +2823,21 @@ static int tcpcheck_main(struct check *check)
goto out;
}
if (check->cs)
if (check->cs) {
if (check->wait_list.events)
cs->conn->xprt->unsubscribe(cs->conn,
cs->conn->xprt_ctx,
check->wait_list.events,
&check->wait_list);
/* We may have been scheduled to run, and the
* I/O handler expects to have a cs, so remove
* the tasklet
*/
task_remove_from_tasklet_list((struct task *)check->wait_list.task);
cs_destroy(check->cs);
}
check->cs = cs;
conn = cs->conn;