]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: server: fix srv downtime calcul on starting
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 29 Oct 2020 14:59:04 +0000 (15:59 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 29 Oct 2020 17:52:18 +0000 (18:52 +0100)
When a server is up after a failure, its downtime was reset to 0 on the
statistics. This is due to a wrong condition that causes srv.down_time
to never be set. Fix this by updating down_time each time the server is in
STARTING state.

Fixes the github issue #920.
This bug can be backported up to 1.8.

src/server.c

index bcef94f5babcf17741bea19c5c39cefc9fbdfa81..c757cdd36df1b8237971c178c684f3e76d898c63 100644 (file)
@@ -4729,7 +4729,7 @@ static void srv_update_status(struct server *s)
                                s->proxy->last_change = now.tv_sec;
                        }
 
-                       if (s->next_state == SRV_ST_STOPPED && s->last_change < now.tv_sec)     // ignore negative times
+                       if (s->cur_state == SRV_ST_STOPPED && s->last_change < now.tv_sec)      // ignore negative times
                                s->down_time += now.tv_sec - s->last_change;
 
                        s->last_change = now.tv_sec;