Skip to content

Comments

[docker-29.x backport] Restore missing nwEndpointsMu.Lock#51558

Merged
thaJeztah merged 1 commit intomoby:docker-29.xfrom
robmry:backport-29.x-replace_lock_in_remote_nw_driver
Nov 19, 2025
Merged

[docker-29.x backport] Restore missing nwEndpointsMu.Lock#51558
thaJeztah merged 1 commit intomoby:docker-29.xfrom
robmry:backport-29.x-replace_lock_in_remote_nw_driver

Conversation

@robmry
Copy link
Contributor

@robmry robmry commented Nov 18, 2025 •
edited by vvoland
Loading

- What I did

revokeExternalConnectivity unlocked d.nwEndpointsMu.Lock() without locking it.

We're clearly missing some test coverage here - but let's get the fix in, and I'll follow up with that when I get a bit more time.

- How I did it

- How to verify it

- Human readable description for the release notes

Fix an issue that caused daemon crash when using a remote network driver plugin

- A picture of a cute animal (not mandatory but encouraged)

@robmry
Restore missing nwEndpointsMu.Lock
3c6e5f0 
- introduced by 4f7afb8 (Remove libnet's logic to track a driver's
  port mapping state)

Signed-off-by: Rob Murray <rob.murray@docker.com>
(cherry picked from commit ed10b98)
Signed-off-by: Rob Murray <rob.murray@docker.com>
@robmry robmry added this to the 29.0.3 milestone Nov 18, 2025
@robmry robmry self-assigned this Nov 18, 2025
@github-actions github-actions bot added the area/daemon Core Engine label Nov 18, 2025
@robmry robmry requested a review from thaJeztah November 19, 2025 15:54
@thaJeztah thaJeztah changed the title [backport docker-29.x] Restore missing nwEndpointsMu.Lock [docker-29.x backport] Restore missing nwEndpointsMu.Lock Nov 19, 2025
thaJeztah
thaJeztah approved these changes Nov 19, 2025
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit 1fa8a31 into moby:docker-29.x Nov 19, 2025
308 of 319 checks passed
@robmry robmry deleted the backport-29.x-replace_lock_in_remote_nw_driver branch November 26, 2025 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees

@robmry robmry

Labels

area/daemon Core Engine area/networking Networking impact/changelog kind/bugfix PR's that fix bugs

Projects

None yet

Milestone

29.0.3

Development

Successfully merging this pull request may close these issues.

2 participants

@robmry @thaJeztah