]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: checks: a down server going to maint remains definitely stucked on down...
authorEmeric Brun <ebrun@haproxy.com>
Wed, 6 Dec 2017 15:47:17 +0000 (16:47 +0100)
committerWilly Tarreau <w@1wt.eu>
Wed, 6 Dec 2017 16:01:00 +0000 (17:01 +0100)
The new admin state was not correctly commited in this case.
Checks were fully disabled but the server was not marked in MAINT state.
It results with a server definitely stucked on the DOWN state.

This patch should be backported on haproxy 1.8

src/server.c

index 9b4d66f941024d857549a71496ca7e1ebcec634e..23e4cc98e0853706e826455c969ab400494c3413 100644 (file)
@@ -4623,6 +4623,9 @@ void srv_update_status(struct server *s)
                                free_trash_chunk(tmptrash);
                                tmptrash = NULL;
                        }
+                       /* commit new admin status */
+
+                       s->cur_admin = s->next_admin;
                }
                else {  /* server was still running */
                        check->health = 0; /* failure */