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

BUG/MEDIUM: stick-table: use the update lock when reading tables from peers

Browse Source 
In 2.9, the stick-tables' locking was split between the lock used to
manipulate the contents (->lock) and the lock used to manipulate the
list of updates and the update indexes (->updt_lock). This was done
with commit 87e072eea5 ("MEDIUM: stick-table: use a distinct lock for
the updates tree"). However a part was overlooked in the peers code,
the parts that consult (and update) the indexes use the table's lock
instead of the update lock. It's surprising that it hasn't caused more
trouble. It's likely due to the fact that the tree nodes are not often
immediately freed and that their memory area remains connected to valid
nodes in the tree during peer_stksess_lookup(), while other parts only
check or update indexes, thus are not that critical.

This needs to be backported wherever the commit above is, thus logically
2.9.
This commit is contained in:
Willy Tarreau 2024-04-02 18:12:09 +02:00
parent 3abf6934a4
commit ed45d13321
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/peers.c
View File

@ -1653,9 +1653,9 @@ static inline int peer_send_teach_process_msgs(struct appctx *appctx, struct pee
{
int ret;
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
ret = peer_send_teachmsgs(appctx, p, peer_teach_process_stksess_lookup, st);
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
return ret;
}
@ -2689,18 +2689,18 @@ static inline int peer_send_msgs(struct appctx *appctx,
}
if (!(peer->flags & PEER_F_TEACH_PROCESS)) {
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
if (!(peer->flags & PEER_F_LEARN_ASSIGN) &&
(st->last_pushed != st->table->localupdate)) {
repl = peer_send_teach_process_msgs(appctx, peer, st);
if (repl <= 0) {
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
peer->stop_local_table = peer->last_local_table;
return repl;
}
}
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
}
else if (!(peer->flags & PEER_F_TEACH_FINISHED)) {
if (!(st->flags & SHTABLE_F_TEACH_STAGE1)) {
@ -2895,7 +2895,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers)
uint commitid, updateid;
st->last_get = st->last_acked = 0;
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
/* if st->update appears to be in future it means
* that the last acked value is very old and we
* remain unconnected a too long time to use this
@ -2919,7 +2919,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers)
__ha_cpu_relax();
}
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
}
/* reset teaching and learning flags to 0 */
@ -2960,7 +2960,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers)
uint updateid, commitid;
st->last_get = st->last_acked = 0;
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
/* if st->update appears to be in future it means
* that the last acked value is very old and we
* remain unconnected a too long time to use this
@ -2984,7 +2984,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers)
__ha_cpu_relax();
}
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock);
HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock);
}
/* Init confirm counter */