RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-25 14:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: peers: Use a peer flag to block the applet waiting ack of the sync task

Browse Source 
Since recent fixes on peers, some changes on a peer must be acknowledged
by the sync task before letting the peer applet processing messages.
Blocking conditions was based on a combination of flags. It was
errorprone. So, this patch introduces PEER_F_WAIT_SYNCTASK_ACK peer flag for
this purpose. This flag is set by the peer when it must wait for an ack from
the sync task. This sync task, on its side, must remove it and wake the peer
up.
This commit is contained in:
Christopher Faulet 2024-04-24 10:41:07 +02:00
parent f80f1635ec
commit 12014587fa
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/peers.c
View File

@ -103,6 +103,9 @@
/* unused : 0x00004000 */
#define PEER_F_ST_RELEASED 0x00008000 /* Used to set a peer in released state. */
#define PEER_F_RESYNC_REQUESTED 0x00010000 /* A resnyc was explicitly requested */
#define PEER_F_WAIT_SYNCTASK_ACK 0x00020000 /* Stop all processing waiting for the sync task acknowledgement when the applet state changes */
/* unused : 0x00020000..0x10000000 */
#define PEER_F_ALIVE 0x20000000 /* Used to flag a peer a alive. */
#define PEER_F_HEARTBEAT 0x40000000 /* Heartbeat message to send. */
@ -1078,7 +1081,7 @@ void __peer_session_deinit(struct peer *peer)
/* Mark peer as released */
peer->flags &= PEER_STATE_RESET;
peer->flags |= PEER_F_ST_RELEASED;
peer->flags |= (PEER_F_ST_RELEASED|PEER_F_WAIT_SYNCTASK_ACK);
task_wakeup(peers->sync_task, TASK_WOKEN_MSG);
}
@ -2852,7 +2855,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers)
peer->flags &= PEER_TEACH_RESET;
peer->flags &= PEER_STATE_RESET;
peer->flags |= PEER_F_ST_ACCEPTED;
peer->flags |= (PEER_F_ST_ACCEPTED|PEER_F_WAIT_SYNCTASK_ACK);
/* Init cursors */
for (st = peer->tables; st ; st = st->next) {
@ -2943,7 +2946,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers)
}
peer->flags &= PEER_STATE_RESET;
peer->flags |= PEER_F_ST_CONNECTED;
peer->flags |= (PEER_F_ST_CONNECTED|PEER_F_WAIT_SYNCTASK_ACK);
}
/*
@ -3153,7 +3156,7 @@ switchstate:
}
}
if (curpeer->flags & (PEER_F_ST_RELEASED|PEER_F_ST_ACCEPTED|PEER_F_ST_CONNECTED))
if (curpeer->flags & PEER_F_WAIT_SYNCTASK_ACK)
goto out;
reql = peer_recv_msg(appctx, (char *)msg_head, sizeof msg_head, &msg_len, &totl);
@ -3486,6 +3489,12 @@ static void __process_running_peer_sync(struct task *task, struct peers *peers,
__process_peer_learn_status(peers, ps);
__process_peer_state(peers, ps);
/* Peer changes, if any, were now ack by the sync task. Unblock
* the peer (any wakeup should already be performed, no need to
* do it here)
*/
ps->flags &= ~PEER_F_WAIT_SYNCTASK_ACK;
/* For each remote peers */
if (!ps->local) {
if (!ps->appctx) {
@ -3625,6 +3634,12 @@ static void __process_stopping_peer_sync(struct task *task, struct peers *peers,
__process_peer_learn_status(peers, ps);
__process_peer_state(peers, ps);
/* Peer changes, if any, were now ack by the sync task. Unblock
* the peer (any wakeup should already be performed, no need to
* do it here)
*/
ps->flags &= ~PEER_F_WAIT_SYNCTASK_ACK;
if ((state & TASK_WOKEN_SIGNAL) && !(peers->flags & PEERS_F_DONOTSTOP)) {
/* we're killing a connection, we must apply a random delay before
* retrying otherwise the other end will do the same and we can loop