Set a timeout on the netlink handle sockets

aboch · aboch · commit f459afbcfc5f · 2016-11-15T12:08:36.000-08:00
Signed-off-by: Alessandro Boch &lt;aboch@docker.com&gt;
diff --git a/drivers/overlay/ov_network.go b/drivers/overlay/ov_network.go
@@ -320,6 +320,11 @@ func populateVNITbl() {
 			}
 			defer nlh.Delete()
 
+			err = nlh.SetSocketTimeout(soTimeout)
+			if err != nil {
+				logrus.Warnf("Failed to set the timeout on the netlink handle sockets for vni table population: %v", err)
+			}
+
 			links, err := nlh.LinkList()
 			if err != nil {
 				logrus.Errorf("Failed to list interfaces during vni population for ns %s: %v", path, err)
diff --git a/drivers/overlay/ov_utils.go b/drivers/overlay/ov_utils.go
@@ -13,6 +13,8 @@ import (
 	"github.com/vishvananda/netns"
 )
 
+var soTimeout = ns.NetlinkSocketsTimeout
+
 func validateID(nid, eid string) error {
 	if nid == "" {
 		return fmt.Errorf("invalid network id")
@@ -134,6 +136,10 @@ func deleteVxlanByVNI(path string, vni uint32) error {
 			return fmt.Errorf("failed to get netlink handle for ns %s: %v", path, err)
 		}
 		defer nlh.Delete()
+		err = nlh.SetSocketTimeout(soTimeout)
+		if err != nil {
+			logrus.Warnf("Failed to set the timeout on the netlink handle sockets for vxlan deletion: %v", err)
+		}
 	}
 
 	links, err := nlh.LinkList()
diff --git a/ns/init_linux.go b/ns/init_linux.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/vishvananda/netlink"
@@ -17,6 +18,8 @@ var (
 	initNs   netns.NsHandle
 	initNl   *netlink.Handle
 	initOnce sync.Once
+	// NetlinkSocketsTimeout represents the default timeout duration for the sockets
+	NetlinkSocketsTimeout = 3 * time.Second
 )
 
 // Init initializes a new network namespace
@@ -30,6 +33,10 @@ func Init() {
 	if err != nil {
 		logrus.Errorf("could not create netlink handle on initial namespace: %v", err)
 	}
+	err = initNl.SetSocketTimeout(NetlinkSocketsTimeout)
+	if err != nil {
+		logrus.Warnf("Failed to set the timeout on the default netlink handle sockets: %v", err)
+	}
 }
 
 // SetNamespace sets the initial namespace handler
diff --git a/osl/namespace_linux.go b/osl/namespace_linux.go
@@ -211,6 +211,11 @@ func NewSandbox(key string, osCreate, isRestore bool) (Sandbox, error) {
 		return nil, fmt.Errorf("failed to create a netlink handle: %v", err)
 	}
 
+	err = n.nlHandle.SetSocketTimeout(ns.NetlinkSocketsTimeout)
+	if err != nil {
+		logrus.Warnf("Failed to set the timeout on the sandbox netlink handle sockets: %v", err)
+	}
+
 	if err = n.loopbackUp(); err != nil {
 		n.nlHandle.Delete()
 		return nil, err
@@ -253,6 +258,11 @@ func GetSandboxForExternalKey(basePath string, key string) (Sandbox, error) {
 		return nil, fmt.Errorf("failed to create a netlink handle: %v", err)
 	}
 
+	err = n.nlHandle.SetSocketTimeout(ns.NetlinkSocketsTimeout)
+	if err != nil {
+		logrus.Warnf("Failed to set the timeout on the sandbox netlink handle sockets: %v", err)
+	}
+
 	if err = n.loopbackUp(); err != nil {
 		n.nlHandle.Delete()
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import (`
`13`	`13`	`"github.com/vishvananda/netns"`
`14`	`14`	`)`
`15`	`15`
	`16`	`+var soTimeout = ns.NetlinkSocketsTimeout`
	`17`	`+`
`16`	`18`	`func validateID(nid, eid string) error {`
`17`	`19`	`if nid == "" {`
`18`	`20`	`return fmt.Errorf("invalid network id")`
`@@ -134,6 +136,10 @@ func deleteVxlanByVNI(path string, vni uint32) error {`
`134`	`136`	`return fmt.Errorf("failed to get netlink handle for ns %s: %v", path, err)`
`135`	`137`	`}`
`136`	`138`	`defer nlh.Delete()`
	`139`	`+ err = nlh.SetSocketTimeout(soTimeout)`
	`140`	`+ if err != nil {`
	`141`	`+ logrus.Warnf("Failed to set the timeout on the netlink handle sockets for vxlan deletion: %v", err)`
	`142`	`+ }`
`137`	`143`	`}`
`138`	`144`
`139`	`145`	`links, err := nlh.LinkList()`