mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-04-01 22:48:25 +00:00
BUG/MINOR: checks: successful check completion must not re-enable MAINT servers
If a server is switched to maintenance mode while a check is in progress, the successful completion of the check must not switch it back up. This is still a consequence of using the same function set_server_up() for every state change. Bug reported by Igor at owind. This fix should be backported to 1.4 which is affected as well.
This commit is contained in:
parent
3ef5af3dcc
commit
9f708ab707
@ -1682,7 +1682,8 @@ static struct task *process_chk(struct task *t)
|
||||
set_server_disabled(check);
|
||||
}
|
||||
|
||||
if (check->health < check->rise + check->fall - 1) {
|
||||
if (!(s->state & SRV_MAINTAIN) &&
|
||||
check->health < check->rise + check->fall - 1) {
|
||||
check->health++; /* was bad, stays for a while */
|
||||
set_server_up(check);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user