Add timeout option for GRPC connection

mlaventure · mlaventure · commit 4ecebc4e0f30 · 2016-03-28T10:09:40.000-07:00
Signed-off-by: Kenfe-Mickael Laventure &lt;mickael.laventure@gmail.com&gt;
diff --git a/ctr/container.go b/ctr/container.go
@@ -28,7 +28,7 @@ import (
 func getClient(ctx *cli.Context) types.APIClient {
 	// reset the logger for grpc to log to dev/null so that it does not mess with our stdio
 	grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
-	dialOpts := []grpc.DialOption{grpc.WithInsecure()}
+	dialOpts := []grpc.DialOption{grpc.WithInsecure(), grpc.WithTimeout(ctx.GlobalDuration("conn-timeout"))}
 	dialOpts = append(dialOpts,
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
 			return net.DialTimeout("unix", addr, timeout)
diff --git a/ctr/main.go b/ctr/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
@@ -43,6 +44,11 @@ func main() {
 			Value: "/run/containerd/containerd.sock",
 			Usage: "address of GRPC API",
 		},
+		cli.DurationFlag{
+			Name:  "conn-timeout",
+			Value: 1 * time.Second,
+			Usage: "GRPC connection timeout",
+		},
 	}
 	app.Commands = []cli.Command{
 		checkpointCommand,
