add timeouts to contexts

Author: clinta

docker/core/core.go

@@ -19,8 +19,14 @@ const (
 	networkDriverName = vxrouter.NetworkDriver
 	ipamDriverName    = vxrouter.IpamDriver
 	envPrefix         = vxrouter.EnvPrefix
+	dockerTimeout     = 5 * time.Second
 )
 
+func toCtx() context.Context {
+	c, _ := context.WithTimeout(context.Background(), dockerTimeout)
+	return c
+}
+
 // Core is a wrapper for docker client type things
 type Core struct {
 	dc       *client.Client
@@ -94,7 +100,7 @@ func (c *Core) getNrFromCache(s string) *types.NetworkResource {
 
 // GetContainers gets a list of docker containers
 func (c *Core) GetContainers() ([]types.Container, error) {
-	return c.dc.ContainerList(context.Background(), types.ContainerListOptions{})
+	return c.dc.ContainerList(toCtx(), types.ContainerListOptions{})
 }
 
 // GetNetworkResourceByID gets a network resource by ID (checks cache first)
@@ -108,7 +114,7 @@ func (c *Core) GetNetworkResourceByID(id string) (*types.NetworkResource, error)
 	}
 
 	//netid wasn't in cache, fetch from docker inspect
-	nnr, err := c.dc.NetworkInspect(context.Background(), id)
+	nnr, err := c.dc.NetworkInspect(toCtx(), id)
 	if err != nil {
 		log.WithError(err).Error("failed to inspect network")
 		return nil, err
@@ -132,7 +138,7 @@ func (c *Core) GetNetworkResourceByPool(pool string) (*types.NetworkResource, er
 
 	flts := filters.NewArgs()
 	flts.Add("driver", networkDriverName)
-	nl, err := c.dc.NetworkList(context.Background(), types.NetworkListOptions{Filters: flts})
+	nl, err := c.dc.NetworkList(toCtx(), types.NetworkListOptions{Filters: flts})
 	if err != nil {
 		log.WithError(err).Error("failed to list networks")
 		return nil, err

docker/vxrnet/main.go

@@ -21,10 +21,16 @@ import (
 )
 
 const (
-	version   = vxrouter.Version
-	envPrefix = vxrouter.EnvPrefix
+	version         = vxrouter.Version
+	envPrefix       = vxrouter.EnvPrefix
+	shutdownTimeout = 10 * time.Second
 )
 
+func shutdownContext() context.Context {
+	c, _ := context.WithTimeout(context.Background(), shutdownTimeout)
+	return c
+}
+
 func main() {
 	app := cli.NewApp()
 	app.Name = "docker-" + network.DriverName
@@ -115,12 +121,12 @@ func Run(ctx *cli.Context) {
 	case <-c:
 	}
 
-	err = nh.Shutdown(context.Background())
+	err = nh.Shutdown(shutdownContext())
 	if err != nil {
 		log.WithField("driver", network.DriverName).WithError(err).Error("error shutting down driver")
 	}
 
-	err = ih.Shutdown(context.Background())
+	err = ih.Shutdown(shutdownContext())
 	if err != nil {
 		log.WithField("driver", ipam.DriverName).WithError(err).Error("error shutting down driver")
 	}