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

Cleanup vxlan interface by id before creating

Browse source 
Currently we are cleaning up vxlan interfaces by name
before trying to setup an interface with the same name.
But this doesn't work for properly cleaning up vxlan
interfaces with the same vni, if the interface has a
a different name than the one expected. The fix is to
delete the interface based on vni.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2015-12-21 14:51:39 -08:00
parent b464d40ce6
commit 66141b879f
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/drivers/overlay/ov_network.go
View file

@ -267,8 +267,8 @@ func (n *network) initSubnetSandbox(s *subnet) error {
vxlanName := n.generateVxlanName(s)
// Try to delete the vxlan interface if already present
deleteVxlan(vxlanName)
// Try to delete the vxlan interface by vni if already present
deleteVxlanByVNI(n.vxlanID(s))
err := createVxlan(vxlanName, n.vxlanID(s))
if err != nil {

22
libnetwork/drivers/overlay/ov_utils.go
View file

@ -81,3 +81,25 @@ func deleteVxlan(name string) error {
return nil
}
func deleteVxlanByVNI(vni uint32) error {
defer osl.InitOSContext()()
links, err := netlink.LinkList()
if err != nil {
return fmt.Errorf("failed to list interfaces while deleting vxlan interface by vni: %v", err)
}
for _, l := range links {
if l.Type() == "vxlan" && l.(*netlink.Vxlan).VxlanId == int(vni) {
err = netlink.LinkDel(l)
if err != nil {
return fmt.Errorf("error deleting vxlan interface with id %d: %v", vni, err)
}
return nil
}
}
return fmt.Errorf("could not find a vxlan interface to delete with id %d", vni)
}