mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-04 09:11:02 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: peers: Separate id of update messages from the update tree

Browse Source 
Now the updates are no longer tracked by stick-table and we are no longer
use their id to detect missed updates, there is no reason to have a matching
between the internal update id in the id used in updated messages.

So, now, for a given peer, id of the last update messages sent is saved in
each shared table and it is incremented when a new message is updated.
This commit is contained in:
Christopher Faulet 2025-10-08 17:48:23 +02:00
parent f64cba38fc
commit ded62e3ea4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/peers-t.h
View File

@ -137,6 +137,7 @@ struct shared_table {
int local_id; int local_id;
int remote_id; int remote_id;
int flags; int flags;
unsigned int update_id;
uint64_t remote_data; uint64_t remote_data;
unsigned int remote_data_nbelem[STKTABLE_DATA_TYPES]; unsigned int remote_data_nbelem[STKTABLE_DATA_TYPES];
unsigned int last_acked; unsigned int last_acked;

16
src/peers.c
View File

@ -715,9 +715,8 @@ int peer_prepare_updatemsg(char *msg, size_t size, struct peer_prep_params *p)
/* construct message */ /* construct message */
/* check if we need to send the update identifier */ /* check if we need to send the update identifier */
if (!st->last_pushed || updateid < st->last_pushed || ((updateid - st->last_pushed) != 1)) { if (!peer->last.table || updateid < peer->last.id || (updateid - peer->last.id) != 1)
use_identifier = 1; use_identifier = 1;
}
/* encode update identifier if needed */ /* encode update identifier if needed */
if (use_identifier) { if (use_identifier) {
@ -1648,7 +1647,7 @@ int peer_send_teachmsgs(struct appctx *appctx, struct peer *p,
while (1) { while (1) {
struct stksess *ts; struct stksess *ts;
unsigned updateid; unsigned last_pushed;
/* push local updates */ /* push local updates */
ts = peer_stksess_lookup(st); ts = peer_stksess_lookup(st);
@ -1657,10 +1656,10 @@ int peer_send_teachmsgs(struct appctx *appctx, struct peer *p,
break; break;
} }
updateid = ts->upd.key; last_pushed = ts->upd.key;
if (p->srv->shard && ts->shard != p->srv->shard) { if (p->srv->shard && ts->shard != p->srv->shard) {
/* Skip this entry */ /* Skip this entry */
st->last_pushed = updateid; st->last_pushed = last_pushed;
new_pushed = 1; new_pushed = 1;
continue; continue;
} }
@ -1668,7 +1667,7 @@ int peer_send_teachmsgs(struct appctx *appctx, struct peer *p,
HA_ATOMIC_INC(&ts->ref_cnt); HA_ATOMIC_INC(&ts->ref_cnt);
HA_RWLOCK_RDUNLOCK(STK_TABLE_UPDT_LOCK, &st->table->updt_lock); HA_RWLOCK_RDUNLOCK(STK_TABLE_UPDT_LOCK, &st->table->updt_lock);
ret = peer_send_updatemsg(st, appctx, ts, updateid, new_pushed, use_timed); ret = peer_send_updatemsg(st, appctx, ts, st->update_id, new_pushed, use_timed);
if (HA_RWLOCK_TRYRDLOCK(STK_TABLE_UPDT_LOCK, &st->table->updt_lock) != 0) { if (HA_RWLOCK_TRYRDLOCK(STK_TABLE_UPDT_LOCK, &st->table->updt_lock) != 0) {
if (failed_once) { if (failed_once) {
@ -1692,9 +1691,10 @@ int peer_send_teachmsgs(struct appctx *appctx, struct peer *p,
if (ret <= 0) if (ret <= 0)
break; break;
st->last_pushed = updateid; st->last_pushed = last_pushed;
p->last.table = st; p->last.table = st;
p->last.id = updateid; p->last.id = st->update_id;
st->update_id++;
p->flags &= ~PEER_F_SYNCHED; p->flags &= ~PEER_F_SYNCHED;
/* identifier may not needed in next update message */ /* identifier may not needed in next update message */