mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: peers: resync ended with RESYNC_PARTIAL in wrong cases.

Browse Source 
This bug was introduced with peers.c code re-work (7d0ceeec80):
"struct peer" flags are mistakenly checked instead of
"struct peers" flags to check the resync status of the local peer.

The issue was reported here:
   https://github.com/haproxy/haproxy/issues/545

This bug affects all branches >= 2.0 and should be backported.
This commit is contained in:
Emeric Brun 2020-03-16 10:51:01 +01:00 committed by Christopher Faulet
parent 67b095e797
commit 70de43b77b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peers.c
View File

@ -1027,13 +1027,13 @@ static inline int peer_send_resync_confirmsg(struct appctx *appctx)
* any other negative returned value must be considered as an error with an appctx st0 * any other negative returned value must be considered as an error with an appctx st0
* returned value equal to PEER_SESS_ST_END. * returned value equal to PEER_SESS_ST_END.
*/ */
static inline int peer_send_resync_finishedmsg(struct appctx *appctx, struct peer *peer) static inline int peer_send_resync_finishedmsg(struct appctx *appctx, struct peers *peers)
{ {
struct peer_prep_params p = { struct peer_prep_params p = {
.control.head = { PEER_MSG_CLASS_CONTROL, }, .control.head = { PEER_MSG_CLASS_CONTROL, },
}; };
p.control.head[1] = (peer->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FINISHED ? p.control.head[1] = (peers->flags & PEERS_RESYNC_STATEMASK) == PEERS_RESYNC_FINISHED ?
PEER_MSG_CTRL_RESYNCFINISHED : PEER_MSG_CTRL_RESYNCPARTIAL; PEER_MSG_CTRL_RESYNCFINISHED : PEER_MSG_CTRL_RESYNCPARTIAL;
return peer_send_msg(appctx, peer_prepare_control_msg, &p); return peer_send_msg(appctx, peer_prepare_control_msg, &p);
@ -1950,7 +1950,7 @@ static inline int peer_send_msgs(struct appctx *appctx, struct peer *peer)
} }
if ((peer->flags & PEER_F_TEACH_PROCESS) && !(peer->flags & PEER_F_TEACH_FINISHED)) { if ((peer->flags & PEER_F_TEACH_PROCESS) && !(peer->flags & PEER_F_TEACH_FINISHED)) {
repl = peer_send_resync_finishedmsg(appctx, peer); repl = peer_send_resync_finishedmsg(appctx, peers);
if (repl <= 0) if (repl <= 0)
return repl; return repl;