kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #738 from aboch/bb

Browse source 
Fix bug in bridge driver
This commit is contained in:
Madhu Venugopal 2015-11-09 16:01:54 -08:00
commit df72c8fb8f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -738,7 +738,9 @@ func (d *driver) DeleteNetwork(nid string) error {
// We only delete the bridge when it's not the default bridge. This is keep the backward compatible behavior. // We only delete the bridge when it's not the default bridge. This is keep the backward compatible behavior.
if !config.DefaultBridge { if !config.DefaultBridge {
err = netlink.LinkDel(n.bridge.Link) if err := netlink.LinkDel(n.bridge.Link); err != nil {
logrus.Warnf("Failed to remove bridge interface %s on network %s delete: %v", config.BridgeName, nid, err)
}
} }
return d.storeDelete(config) return d.storeDelete(config)
@ -1037,9 +1039,8 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {
// Remove port mappings. Do not stop endpoint delete on unmap failure // Remove port mappings. Do not stop endpoint delete on unmap failure
n.releasePorts(ep) n.releasePorts(ep)
// Try removal of link. Discard error: link pair might have // Try removal of link. Discard error: it is a best effort.
// already been deleted by sandbox delete. Make sure defer // Also make sure defer does not see this error either.
// does not see this error either.
if link, err := netlink.LinkByName(ep.srcName); err == nil { if link, err := netlink.LinkByName(ep.srcName); err == nil {
netlink.LinkDel(link) netlink.LinkDel(link)
} }