From: Emeric Brun Date: Tue, 23 Feb 2021 16:08:08 +0000 (+0100) Subject: BUG/MEDIUM: peers: reset commitupdate value in new conns X-Git-Tag: v2.3.11~99 X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=cd0a30e441faa7d2c6d71f9541d092140f04e6ef;p=haproxy-2.3.git BUG/MEDIUM: peers: reset commitupdate value in new conns The commitupdate value of the table is used to check if the update is still pending for a push for all peers. To be sure to not miss a push we reset it just after a handshake success. This patch should be backported on all supported branches ( >= 1.6 ) (cherry picked from commit cc9cce9351c2d64476dbe2f35c43cde8a3f97ebe) Signed-off-by: Christopher Faulet --- diff --git a/src/peers.c b/src/peers.c index 3e1f201..048918b 100644 --- a/src/peers.c +++ b/src/peers.c @@ -2403,6 +2403,8 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers) if ((int)(st->table->localupdate - st->update) < 0) st->update = st->table->localupdate + (2147483648U); st->teaching_origin = st->last_pushed = st->update; + if ((int)(st->last_pushed - st->table->commitupdate) > 0) + st->table->commitupdate = st->last_pushed; HA_SPIN_UNLOCK(STK_TABLE_LOCK, &st->table->lock); } @@ -2453,6 +2455,8 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers) if ((int)(st->table->localupdate - st->update) < 0) st->update = st->table->localupdate + (2147483648U); st->teaching_origin = st->last_pushed = st->update; + if ((int)(st->last_pushed - st->table->commitupdate) > 0) + st->table->commitupdate = st->last_pushed; HA_SPIN_UNLOCK(STK_TABLE_LOCK, &st->table->lock); }