From a817c2e6c95041bbcb63d92b13dcdf7c31ac9436 Mon Sep 17 00:00:00 2001 From: Emeric Brun Date: Tue, 20 Apr 2021 14:43:46 +0200 Subject: [PATCH] BUG/MEDIUM: peers: reset tables stage flags stages on new conns Flags used as context to know current status of each table pushing a full resync to a peer were correctly reset receiving a new resync request or confirmation message but in case of local peer sync during reload the resync request is implicit and those flags were not correctly reset in this case. This could result to a partial initial resync of some tables after reload if the connection with the old process was broken and retried. This patch reset those flags at the end of the handshake for all new connections to be sure to push a entire full resync if needed. This patch should be backported on all supported branches ( v >= 1.6 ) (cherry picked from commit 1a6b43e13eeb4872dff9944064ddadc1ceb5178f) Signed-off-by: Christopher Faulet (cherry picked from commit 5c88077c8a7f5b2819d5d196e4a822028cbabeac) Signed-off-by: Christopher Faulet (cherry picked from commit 382967794171147b1c1e5ca90dd37722146cdc29) Signed-off-by: Christopher Faulet --- src/peers.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/peers.c b/src/peers.c index dda2492..66c22ae 100644 --- a/src/peers.c +++ b/src/peers.c @@ -2152,6 +2152,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers) if ((int)(st->table->localupdate - st->update) < 0) st->update = st->table->localupdate + (2147483648U); st->teaching_origin = st->last_pushed = st->update; + st->flags = 0; if ((int)(st->last_pushed - st->table->commitupdate) > 0) st->table->commitupdate = st->last_pushed; HA_SPIN_UNLOCK(STK_TABLE_LOCK, &st->table->lock); @@ -2204,6 +2205,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers) if ((int)(st->table->localupdate - st->update) < 0) st->update = st->table->localupdate + (2147483648U); st->teaching_origin = st->last_pushed = st->update; + st->flags = 0; if ((int)(st->last_pushed - st->table->commitupdate) > 0) st->table->commitupdate = st->last_pushed; HA_SPIN_UNLOCK(STK_TABLE_LOCK, &st->table->lock); -- 1.7.10.4