Update grpc timeout and logger

dmcgowan · dmcgowan · commit 55afe3359a46 · 2018-05-29T15:32:37.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcgstyle.net&gt;
diff --git a/client.go b/client.go
@@ -87,7 +87,6 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 		gopts := []grpc.DialOption{
 			grpc.WithBlock(),
 			grpc.WithInsecure(),
-			grpc.WithTimeout(60 * time.Second),
 			grpc.FailOnNonTempDialError(true),
 			grpc.WithBackoffMaxDelay(3 * time.Second),
 			grpc.WithDialer(dialer.Dialer),
@@ -107,7 +106,9 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 			)
 		}
 		connector := func() (*grpc.ClientConn, error) {
-			conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)
+			ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+			defer cancel()
+			conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
 			if err != nil {
 				return nil, errors.Wrapf(err, "failed to dial %q", address)
 			}
diff --git a/client_test.go b/client_test.go
@@ -21,15 +21,11 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io/ioutil"
-	golog "log"
 	"os"
 	"os/exec"
 	"testing"
 	"time"
 
-	"google.golang.org/grpc/grpclog"
-
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
@@ -50,9 +46,6 @@ var (
 )
 
 func init() {
-	// Discard grpc logs so that they don't mess with our stdio
-	grpclog.SetLogger(golog.New(ioutil.Discard, "", golog.LstdFlags))
-
 	flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")
 	flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")
 	flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests")
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -20,7 +20,6 @@ import (
 	gocontext "context"
 	"fmt"
 	"io/ioutil"
-	golog "log"
 	"net"
 	"os"
 	"os/signal"
@@ -50,7 +49,7 @@ high performance container runtime
 
 func init() {
 	// Discard grpc logs so that they don't mess with our stdio
-	grpclog.SetLogger(golog.New(ioutil.Discard, "", golog.LstdFlags))
+	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 
 	cli.VersionPrinter = func(c *cli.Context) {
 		fmt.Println(c.App.Name, version.Package, c.App.Version, version.Revision)
diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go
@@ -95,12 +95,13 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (*
 	gopts := []grpc.DialOption{
 		grpc.WithBlock(),
 		grpc.WithInsecure(),
-		grpc.WithTimeout(60 * time.Second),
 		grpc.WithDialer(d),
 		grpc.FailOnNonTempDialError(true),
 		grpc.WithBackoffMaxDelay(3 * time.Second),
 	}
-	conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)
+	ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 60*time.Second)
+	defer cancel()
+	conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to dial %q", address)
 	}
diff --git a/cmd/ctr/app/main.go b/cmd/ctr/app/main.go
@@ -19,7 +19,6 @@ package app
 import (
 	"fmt"
 	"io/ioutil"
-	"log"
 
 	"github.com/containerd/containerd/cmd/ctr/commands/containers"
 	"github.com/containerd/containerd/cmd/ctr/commands/content"
@@ -44,7 +43,7 @@ var extraCmds = []cli.Command{}
 
 func init() {
 	// Discard grpc logs so that they don't mess with our stdio
-	grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
+	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 
 	cli.VersionPrinter = func(c *cli.Context) {
 		fmt.Println(c.App.Name, version.Package, c.App.Version)

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`87`	`87`	`gopts := []grpc.DialOption{`
`88`	`88`	`grpc.WithBlock(),`
`89`	`89`	`grpc.WithInsecure(),`
`90`		`- grpc.WithTimeout(60 * time.Second),`
`91`	`90`	`grpc.FailOnNonTempDialError(true),`
`92`	`91`	`grpc.WithBackoffMaxDelay(3 * time.Second),`
`93`	`92`	`grpc.WithDialer(dialer.Dialer),`
`@@ -107,7 +106,9 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`107`	`106`	`)`
`108`	`107`	`}`
`109`	`108`	`connector := func() (*grpc.ClientConn, error) {`
`110`		`- conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)`
	`109`	`+ ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)`
	`110`	`+ defer cancel()`
	`111`	`+ conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)`
`111`	`112`	`if err != nil {`
`112`	`113`	`return nil, errors.Wrapf(err, "failed to dial %q", address)`
`113`	`114`	`}`