Fix in bridge delete endpoint
- In DeleteEndpoint(), veth removal is a best effort, as it could have alreayd been removed by sandbox destroy. Therefore if veth is not found, cleanup defer function should not run. Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
parent
f7d4913ab9
commit
1bf751ef93
|
@ -1129,9 +1129,9 @@ func (d *driver) DeleteEndpoint(nid, eid types.UUID) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try removal of link. Discard error: link pair might have
|
// Try removal of link. Discard error: link pair might have
|
||||||
// already been deleted by sandbox delete.
|
// already been deleted by sandbox delete. Make sure defer
|
||||||
link, err := netlink.LinkByName(ep.srcName)
|
// does not see this error either.
|
||||||
if err == nil {
|
if link, err := netlink.LinkByName(ep.srcName); err == nil {
|
||||||
netlink.LinkDel(link)
|
netlink.LinkDel(link)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue