RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-27 07:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: checks: Subscribe to I/O events on an unfinished connect

Browse Source 
In tcp-check based health check, when a new connection is opened, we must wait
it is really established before moving to the next rule. But at this stage, we
must also be sure to subscribe to I/O events. Otherwise, depending on the
timing, the health check may remains sleepy till the timeout.

No backport needed. This patch should fix the issue #622.

(cherry picked from commit b2a4c0d473e3c5dcb87f7d16f2ca410bafc62f64)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
This commit is contained in:
Christopher Faulet 2020-05-09 14:46:43 +02:00
parent 3e235d38ec
commit 2fabd9d535
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/checks.c
View File

@ -1679,6 +1679,7 @@ static enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct
struct connection *conn = NULL; struct connection *conn = NULL;
struct protocol *proto; struct protocol *proto;
struct xprt_ops *xprt; struct xprt_ops *xprt;
struct tcpcheck_rule *next;
int status, port; int status, port;
/* For a connect action we'll create a new connection. We may also have /* For a connect action we'll create a new connection. We may also have
@ -1772,14 +1773,12 @@ static enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct
cs_attach(cs, check, &check_conn_cb); cs_attach(cs, check, &check_conn_cb);
status = SF_ERR_INTERNAL; status = SF_ERR_INTERNAL;
next = get_next_tcpcheck_rule(check->tcpcheck_rules, rule);
if (proto && proto->connect) { if (proto && proto->connect) {
struct tcpcheck_rule *next;
int flags = 0; int flags = 0;
if (check->tcpcheck_rules->flags & TCPCHK_RULES_PROTO_CHK) if (check->tcpcheck_rules->flags & TCPCHK_RULES_PROTO_CHK)
flags |= CONNECT_HAS_DATA; flags |= CONNECT_HAS_DATA;
next = get_next_tcpcheck_rule(check->tcpcheck_rules, rule);
if (!next || next->action != TCPCHK_ACT_EXPECT) if (!next || next->action != TCPCHK_ACT_EXPECT)
flags |= CONNECT_DELACK_ALWAYS; flags |= CONNECT_DELACK_ALWAYS;
status = proto->connect(conn, flags); status = proto->connect(conn, flags);
@ -1892,6 +1891,10 @@ static enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct
/* don't do anything until the connection is established */ /* don't do anything until the connection is established */
if (conn->flags & CO_FL_WAIT_XPRT) { if (conn->flags & CO_FL_WAIT_XPRT) {
if (next && next->action == TCPCHK_ACT_SEND)
conn->mux->subscribe(cs, SUB_RETRY_SEND, &check->wait_list);
else
conn->mux->subscribe(cs, SUB_RETRY_RECV, &check->wait_list);
ret = TCPCHK_EVAL_WAIT; ret = TCPCHK_EVAL_WAIT;
goto out; goto out;
} }