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

BUG/MINOR: checks: do not exit tcp-checks from the middle of the loop

Browse Source 
There's a comment above tcpcheck_main() clearly stating that no return
statement should be placed in the middle, still we did have one after
installing the mux. It looks mostly harmless though as it will only
fail to mark the server as being in error in case of allocation failure
or config issue.

This fix should be backported to 2.0 and probably 1.9 as well.
This commit is contained in:
Willy Tarreau 2019-07-17 18:48:07 +02:00
parent 4da05478e3
commit 2ab5c38359
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/checks.c
View File

@ -2683,7 +2683,7 @@ static char * tcpcheck_get_step_comment(struct check *check, int stepid)
* connection, presenting the risk of an fd replacement. * connection, presenting the risk of an fd replacement.
* *
* Please do NOT place any return statement in this function and only leave * Please do NOT place any return statement in this function and only leave
* via the out_unlock label after setting retcode. * via the out_end_tcpcheck label after setting retcode.
*/ */
static int tcpcheck_main(struct check *check) static int tcpcheck_main(struct check *check)
{ {
@ -2886,8 +2886,12 @@ static int tcpcheck_main(struct check *check)
} }
conn_prepare(conn, proto, xprt); conn_prepare(conn, proto, xprt);
if (conn_install_mux(conn, &mux_pt_ops, cs, proxy, NULL) < 0)
return SF_ERR_RESOURCE; if (conn_install_mux(conn, &mux_pt_ops, cs, proxy, NULL) < 0) {
ret = SF_ERR_RESOURCE;
goto fail_check;
}
cs_attach(cs, check, &check_conn_cb); cs_attach(cs, check, &check_conn_cb);
ret = SF_ERR_INTERNAL; ret = SF_ERR_INTERNAL;
@ -2912,6 +2916,7 @@ static int tcpcheck_main(struct check *check)
* Note that we try to prevent the network stack from sending the ACK during the * Note that we try to prevent the network stack from sending the ACK during the
* connect() when a pure TCP check is used (without PROXY protocol). * connect() when a pure TCP check is used (without PROXY protocol).
*/ */
fail_check:
switch (ret) { switch (ret) {
case SF_ERR_NONE: case SF_ERR_NONE:
/* we allow up to min(inter, timeout.connect) for a connection /* we allow up to min(inter, timeout.connect) for a connection