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

Delete veth on ep leave in overlay driver

Browse source 
Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-01-06 13:30:03 -08:00
parent dfea2836a5
commit fe2fa218d8
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libnetwork/drivers/overlay/joinleave.go
View file

@ -54,6 +54,8 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
return err return err
} }
ep.ifName = name2
// Set the container interface and its peer MTU to 1450 to allow // Set the container interface and its peer MTU to 1450 to allow
// for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) + // for 50 bytes vxlan encap (inner eth header(14) + outer IP(20) +
// outer UDP(8) + vxlan header(8)) // outer UDP(8) + vxlan header(8))
@ -134,5 +136,14 @@ func (d *driver) Leave(nid, eid string) error {
n.leaveSandbox() n.leaveSandbox()
link, err := netlink.LinkByName(ep.ifName)
if err != nil {
log.Warnf("Failed to retrieve interface link for interface removal on endpoint leave: %v", err)
return nil
}
if err := netlink.LinkDel(link); err != nil {
log.Warnf("Failed to delete interface link on endpoint leave: %v", err)
}
return nil return nil
} }

7
libnetwork/drivers/overlay/ov_endpoint.go
View file

@ -11,9 +11,10 @@ import (
type endpointTable map[string]*endpoint type endpointTable map[string]*endpoint
type endpoint struct { type endpoint struct {
id string id string
mac net.HardwareAddr ifName string
addr *net.IPNet mac net.HardwareAddr
addr *net.IPNet
} }
func (n *network) endpoint(eid string) *endpoint { func (n *network) endpoint(eid string) *endpoint {