]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MEDIUM: peers: Don't set PEERS_F_RESYNC_PROCESS flag on a peer
authorChristopher Faulet <cfaulet@haproxy.com>
Fri, 19 Apr 2024 13:39:52 +0000 (15:39 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 19 Apr 2024 15:08:22 +0000 (17:08 +0200)
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.

src/peers.c

index c53dfc175a8228f053dd1a65d58be64bf88dd272..9dda21a55c95d91a0418b39b05dd1892b9647d31 100644 (file)
@@ -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;
                        }