Skip to content

[v1.19] ipam: Use existing mutex for multipool capacity synchronization#44777

Merged
julianwiedmann merged 1 commit intov1.19from
pr/christarazi/v1.19/fix-multipool-mutex
Mar 16, 2026
Merged

[v1.19] ipam: Use existing mutex for multipool capacity synchronization#44777
julianwiedmann merged 1 commit intov1.19from
pr/christarazi/v1.19/fix-multipool-mutex

Conversation

@christarazi
Copy link
Copy Markdown
Member

@christarazi christarazi commented Mar 13, 2026

Directly fixing incorrect backport from #44517.

Reported-by: @giorio94 in #44517 (comment)

The backport conflict resolution incorrectly introduced a new
poolsMutex that isn't used anywhere else, hence providing no actual
synchronization. Use the existing m.mutex instead, matching the
upstream fix.

Fixes: db32834 ("ipam: Fix concurrent map access to multipool map")
Fixes: #44517

Reported-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team as a code owner March 13, 2026 19:41
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.19 This PR represents a backport for Cilium 1.19.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Mar 13, 2026
@christarazi
Copy link
Copy Markdown
Member Author

/test

@christarazi christarazi mentioned this pull request Mar 13, 2026
21 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 16, 2026
@julianwiedmann julianwiedmann added this pull request to the merge queue Mar 16, 2026
Merged via the queue into v1.19 with commit aadc927 Mar 16, 2026
700 of 710 checks passed
@julianwiedmann julianwiedmann deleted the pr/christarazi/v1.19/fix-multipool-mutex branch March 16, 2026 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.19 This PR represents a backport for Cilium 1.19.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants