Actually retry LinkSetUp

polachok · polachok · commit daf4c97f7ace · 2016-07-19T14:20:45.000+03:00
Signed-off-by: Alexander Polakov &lt;plhk@sdf.org&gt;
diff --git a/libnetwork/osl/interface_linux.go b/libnetwork/osl/interface_linux.go
@@ -303,6 +303,7 @@ func (n *networkNamespace) AddInterface(srcName, dstPrefix string, options ...If
 	for err = nlh.LinkSetUp(iface); err != nil && cnt < 3; cnt++ {
 		log.Debugf("retrying link setup because of: %v", err)
 		time.Sleep(10 * time.Millisecond)
+		err = nlh.LinkSetUp(iface)
 	}
 	if err != nil {
 		return fmt.Errorf("failed to set link up: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@ func (n *networkNamespace) AddInterface(srcName, dstPrefix string, options ...If`
`303`	`303`	`for err = nlh.LinkSetUp(iface); err != nil && cnt < 3; cnt++ {`
`304`	`304`	`log.Debugf("retrying link setup because of: %v", err)`
`305`	`305`	`time.Sleep(10 * time.Millisecond)`
	`306`	`+ err = nlh.LinkSetUp(iface)`
`306`	`307`	`}`
`307`	`308`	`if err != nil {`
`308`	`309`	`return fmt.Errorf("failed to set link up: %v", err)`