From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 19 Apr 2024 13:39:52 +0000 (+0200)
Subject: BUG/MEDIUM: peers: Don't set PEERS_F_RESYNC_PROCESS flag on a peer
X-Git-Tag: v3.0-dev8~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0b2015aae;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: peers: Don't set PEERS_F_RESYNC_PROCESS flag on a peer

The bug was introduced by commit 9425aeaffb ("BUG/MAJOR: peers: Update peers
section state from a thread-safe manner"). A peers flags was set on a peer
by error. Just remove it.

This patch must only be backported if the above commit is backported.
---

diff --git a/src/peers.c b/src/peers.c
index c53dfc175a..9dda21a55c 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -3405,7 +3405,7 @@ static void __process_peer_state(struct peers *peers, struct peer *peer)
 			if ((peers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FROMLOCAL &&
 			    !(peers->flags & PEERS_F_RESYNC_ASSIGN)) {
 				/* assign local peer for a lesson, consider lesson already requested */
-				peer->flags |= (PEER_F_LEARN_ASSIGN|PEERS_F_RESYNC_PROCESS);
+				peer->flags |= PEER_F_LEARN_ASSIGN;
 				peers->flags |= (PEERS_F_RESYNC_ASSIGN|PEERS_F_RESYNC_PROCESS);
 				peers->flags |= PEERS_F_RESYNC_LOCALASSIGN;
 			}