Merge pull request #2554 from crosbymichael/timeout

estesp · web-flow · commit a1affdb4ff38 · 2018-08-16T16:39:46.000-04:00
Add WithTimeout as client Opt
diff --git a/client.go b/client.go
@@ -82,6 +82,9 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 			return nil, err
 		}
 	}
+	if copts.timeout == 0 {
+		copts.timeout = 10 * time.Second
+	}
 	rt := fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS)
 	if copts.defaultRuntime != "" {
 		rt = copts.defaultRuntime
@@ -115,7 +118,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 			)
 		}
 		connector := func() (*grpc.ClientConn, error) {
-			ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+			ctx, cancel := context.WithTimeout(context.Background(), copts.timeout)
 			defer cancel()
 			conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
 			if err != nil {
diff --git a/client_opts.go b/client_opts.go
@@ -17,6 +17,8 @@
 package containerd
 
 import (
+	"time"
+
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/remotes"
@@ -28,6 +30,7 @@ type clientOpts struct {
 	defaultRuntime string
 	services       *services
 	dialOptions    []grpc.DialOption
+	timeout        time.Duration
 }
 
 // ClientOpt allows callers to set options on the containerd client
@@ -71,6 +74,14 @@ func WithServices(opts ...ServicesOpt) ClientOpt {
 	}
 }
 
+// WithTimeout sets the connection timeout for the client
+func WithTimeout(d time.Duration) ClientOpt {
+	return func(c *clientOpts) error {
+		c.timeout = d
+		return nil
+	}
+}
+
 // RemoteOpt allows the caller to set distribution options for a remote
 type RemoteOpt func(*Client, *RemoteContext) error
 

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`82`	`82`	`return nil, err`
`83`	`83`	`}`
`84`	`84`	`}`
	`85`	`+ if copts.timeout == 0 {`
	`86`	`+ copts.timeout = 10 * time.Second`
	`87`	`+ }`
`85`	`88`	`rt := fmt.Sprintf("%s.%s", plugin.RuntimePlugin, runtime.GOOS)`
`86`	`89`	`if copts.defaultRuntime != "" {`
`87`	`90`	`rt = copts.defaultRuntime`
`@@ -115,7 +118,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`115`	`118`	`)`
`116`	`119`	`}`
`117`	`120`	`connector := func() (*grpc.ClientConn, error) {`
`118`		`- ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)`
	`121`	`+ ctx, cancel := context.WithTimeout(context.Background(), copts.timeout)`
`119`	`122`	`defer cancel()`
`120`	`123`	`conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)`
`121`	`124`	`if err != nil {`