Merge pull request #369 from Random-Liu/cherrypick-#366-0.7

[Backport v0.7] Fix: failed to set bridge addr: could not add IP address to \"cni0\": file exists
Fix a race condition in the bridge plugin.
2019-08-13 15:00:55 +02:00 · 2019-08-12 10:17:42 -07:00
1 changed files with 1 additions and 1 deletions
--- a/plugins/main/bridge/bridge.go
+++ b/plugins/main/bridge/bridge.go
@@ -170,7 +170,7 @@ func ensureBridgeAddr(br *netlink.Bridge, family int, ipn *net.IPNet, forceAddre
 	}
 	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err := netlink.AddrAdd(br, addr); err != nil {
+	if err := netlink.AddrAdd(br, addr); err != nil && err != syscall.EEXIST {
 		return fmt.Errorf("could not add IP address to %q: %v", br.Name, err)
 	}
Author	SHA1	Message	Date
Casey Callendrello	9f96827c7c	Merge pull request #369 from Random-Liu/cherrypick-#366-0.7 [Backport v0.7] Fix: failed to set bridge addr: could not add IP address to \"cni0\": file exists	2019-08-13 15:00:55 +02:00
Lantao Liu	16f134bb58	Fix a race condition in the bridge plugin. Signed-off-by: Lantao Liu <lantaol@google.com>	2019-08-12 10:17:42 -07:00