beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/drivers/bridge: driver.link: don't defer in a loop

Browse source 
Collect a list of all the links we successfully enabled (if any), and
use a single defer to disable them.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-21 13:01:42 +02:00
parent 76b736c242
commit eba15fe905
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libnetwork/drivers/bridge/bridge.go
View file

@ -1351,14 +1351,24 @@ func (d *driver) RevokeExternalConnectivity(nid, eid string) error {
func (d *driver) link(network *bridgeNetwork, endpoint *bridgeEndpoint, enable bool) (retErr error) {
cc := endpoint.containerConfig
if cc == nil {
return nil
}
ec := endpoint.extConnConfig
if ec == nil {
if cc == nil || ec == nil || (len(cc.ParentEndpoints) == 0 && len(cc.ChildEndpoints) == 0) {
// nothing to do
return nil
}
// Try to keep things atomic. addedLinks keeps track of links that were
// successfully added. If any error occurred, then roll back all.
var addedLinks []*link
defer func() {
if retErr == nil {
return
}
for _, l := range addedLinks {
l.Disable()
}
}()
if ec.ExposedPorts != nil {
for _, p := range cc.ParentEndpoints {
parentEndpoint, err := network.getEndpoint(p)
@ -1374,11 +1384,7 @@ func (d *driver) link(network *bridgeNetwork, endpoint *bridgeEndpoint, enable b
if err := l.Enable(); err != nil {
return err
}
defer func() {
if retErr != nil {
l.Disable()
}
}()
addedLinks = append(addedLinks, l)
} else {
l.Disable()
}
@ -1402,11 +1408,7 @@ func (d *driver) link(network *bridgeNetwork, endpoint *bridgeEndpoint, enable b
if err := l.Enable(); err != nil {
return err
}
defer func() {
if retErr != nil {
l.Disable()
}
}()
addedLinks = append(addedLinks, l)
} else {
l.Disable()
}