ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Route del would fail due to wrong scope; better errors

Browse Source 
In some cases the route deletion would fail due to wrong
scope. It should be NOWHERE when deleting (per iproute2).
This also adds more verbose error messages.
This commit is contained in:
Eugene Yakubovich 2015-09-29 11:27:49 -07:00
parent f0266a2717
commit 5efd3ba883
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/main/ptp/ptp.go
View File

@ -70,7 +70,7 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
contVeth, err := netlink.LinkByName(ifName)
if err != nil {
return err
return fmt.Errorf("failed to look up %q: %v", ifName, err)
}
// Delete the route that was automatically added
@ -80,12 +80,11 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
IP: pr.IP4.IP.IP.Mask(pr.IP4.IP.Mask),
Mask: pr.IP4.IP.Mask,
},
Scope: netlink.SCOPE_LINK,
Src: pr.IP4.IP.IP,
Scope: netlink.SCOPE_NOWHERE,
}
if err := netlink.RouteDel(&route); err != nil {
return err
return fmt.Errorf("failed to delete route %v: %v", route, err)
}
for _, r := range []netlink.Route{
@ -110,7 +109,7 @@ func setupContainerVeth(netns, ifName string, mtu int, pr *types.Result) (string
},
} {
if err := netlink.RouteAdd(&r); err != nil {
return err
return fmt.Errorf("failed to add route %v: %v", r, err)
}
}