From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 29 Oct 2020 14:59:05 +0000 (+0100)
Subject: BUG/MINOR: server: fix down_time report for stats
X-Git-Tag: v2.3-dev9~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6ba7915ebdfb79d1d74eb402bbc2747c4a1c6dd;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: fix down_time report for stats

Adjust condition used to report down_time for statistics. There was a
tiny probabilty to have a negative downtime if last_change was superior
to now. If this is the case, return only down_time.

This bug can backported up to 1.8.
---

diff --git a/src/server.c b/src/server.c
index c757cdd36d..5ea6ca12c6 100644
--- a/src/server.c
+++ b/src/server.c
@@ -74,7 +74,7 @@ struct eb_root state_file = EB_ROOT_UNIQUE;
 
 int srv_downtime(const struct server *s)
 {
-	if ((s->cur_state != SRV_ST_STOPPED) && s->last_change < now.tv_sec)		// ignore negative time
+	if ((s->cur_state != SRV_ST_STOPPED) || s->last_change >= now.tv_sec)		// ignore negative time
 		return s->down_time;
 
 	return now.tv_sec - s->last_change + s->down_time;