From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 29 Oct 2020 14:59:04 +0000 (+0100)
Subject: BUG/MINOR: server: fix srv downtime calcul on starting
X-Git-Tag: v2.3-dev9~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe2bf091f6f2c155b5d7b1372a43b73bb034002f;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: fix srv downtime calcul on starting

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.
---

diff --git a/src/server.c b/src/server.c
index bcef94f5ba..c757cdd36d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -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;