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

host-device: revert name setting to make retries idempotent

Browse Source 
Signed-off-by: Bruce Ma <brucema19901024@gmail.com>
This commit is contained in:
Bruce Ma 2019-07-19 21:26:07 +08:00
parent 7ba2bcfeab
commit 57650a1e5b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/main/host-device/host-device.go
View File

@ -218,14 +218,23 @@ func moveLinkOut(containerNs ns.NetNS, ifName string) error {
} }
// Devices can be renamed only when down // Devices can be renamed only when down
if err := netlink.LinkSetDown(dev); err != nil { if err = netlink.LinkSetDown(dev); err != nil {
return fmt.Errorf("failed to set %q down: %v", ifName, err) return fmt.Errorf("failed to set %q down: %v", ifName, err)
} }
// Rename device to it's original name // Rename device to it's original name
if err := netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil { if err = netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil {
return fmt.Errorf("failed to restore %q to original name %q: %v", ifName, dev.Attrs().Alias, err) return fmt.Errorf("failed to restore %q to original name %q: %v", ifName, dev.Attrs().Alias, err)
} }
if err := netlink.LinkSetNsFd(dev, int(defaultNs.Fd())); err != nil { defer func() {
if err != nil {
// if moving device to host namespace fails, we should revert device name
// to ifName to make sure that device can be found in retries
_ = netlink.LinkSetName(dev, ifName)
}
}()
if err = netlink.LinkSetNsFd(dev, int(defaultNs.Fd())); err != nil {
return fmt.Errorf("failed to move %q to host netns: %v", dev.Attrs().Alias, err) return fmt.Errorf("failed to move %q to host netns: %v", dev.Attrs().Alias, err)
} }
return nil return nil