Add with block and fail on non-temp dial error

dmcgowan · dmcgowan · commit 64bc516bbef0 · 2017-06-14T16:50:37.000-07:00
This guarantees that grpc requests will fail quickly when the service is not started or does not have permission. Without the fail on non-temp error the withblock will cause the client to wait until the timeout before failing. Fixes #989 Signed-off-by: Derek McGowan <derek@mcgstyle.net>
diff --git a/client.go b/client.go
@@ -65,9 +65,11 @@ func New(address string, opts ...ClientOpt) (*Client, error) {
 	}
 
 	gopts := []grpc.DialOption{
+		grpc.WithBlock(),
 		grpc.WithInsecure(),
 		grpc.WithTimeout(100 * time.Second),
 		grpc.WithDialer(dialer),
+		grpc.FailOnNonTempDialError(true),
 	}
 	if copts.defaultns != "" {
 		unary, stream := newNSInterceptors(copts.defaultns)
diff --git a/client_test.go b/client_test.go
@@ -67,13 +67,9 @@ func TestMain(m *testing.M) {
 		}
 	}
 
-	client, err := New(address)
+	client, err := waitForDaemonStart(ctx, address)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-	if err := waitForDaemonStart(ctx, client); err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		fmt.Fprintln(os.Stderr, "immediate fail!", err)
 		os.Exit(1)
 	}
 
@@ -110,20 +106,26 @@ func TestMain(m *testing.M) {
 	os.Exit(status)
 }
 
-func waitForDaemonStart(ctx context.Context, client *Client) error {
+func waitForDaemonStart(ctx context.Context, address string) (*Client, error) {
 	var (
+		client  *Client
 		serving bool
 		err     error
 	)
 
 	for i := 0; i < 20; i++ {
-		serving, err = client.IsServing(ctx)
-		if serving {
-			return nil
+		if client == nil {
+			client, err = New(address)
+		}
+		if err == nil {
+			serving, err = client.IsServing(ctx)
+			if serving {
+				return client, nil
+			}
 		}
 		time.Sleep(100 * time.Millisecond)
 	}
-	return fmt.Errorf("containerd did not start within 2s: %v", err)
+	return nil, fmt.Errorf("containerd did not start within 2s: %v", err)
 }
 
 func TestNewClient(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,11 @@ func New(address string, opts ...ClientOpt) (*Client, error) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`gopts := []grpc.DialOption{`
	`68`	`+ grpc.WithBlock(),`
`68`	`69`	`grpc.WithInsecure(),`
`69`	`70`	`grpc.WithTimeout(100 * time.Second),`
`70`	`71`	`grpc.WithDialer(dialer),`
	`72`	`+ grpc.FailOnNonTempDialError(true),`
`71`	`73`	`}`
`72`	`74`	`if copts.defaultns != "" {`
`73`	`75`	`unary, stream := newNSInterceptors(copts.defaultns)`
Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,9 @@ func TestMain(m *testing.M) {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- client, err := New(address)`
	`70`	`+ client, err := waitForDaemonStart(ctx, address)`
`71`	`71`	`if err != nil {`
`72`		`- fmt.Fprintln(os.Stderr, err)`
`73`		`- os.Exit(1)`
`74`		`- }`
`75`		`- if err := waitForDaemonStart(ctx, client); err != nil {`
`76`		`- fmt.Fprintln(os.Stderr, err)`
	`72`	`+ fmt.Fprintln(os.Stderr, "immediate fail!", err)`
`77`	`73`	`os.Exit(1)`
`78`	`74`	`}`
`79`	`75`
`@@ -110,20 +106,26 @@ func TestMain(m *testing.M) {`
`110`	`106`	`os.Exit(status)`
`111`	`107`	`}`
`112`	`108`
`113`		`-func waitForDaemonStart(ctx context.Context, client *Client) error {`
	`109`	`+func waitForDaemonStart(ctx context.Context, address string) (*Client, error) {`
`114`	`110`	`var (`
	`111`	`+ client *Client`
`115`	`112`	`serving bool`
`116`	`113`	`err error`
`117`	`114`	`)`
`118`	`115`
`119`	`116`	`for i := 0; i < 20; i++ {`
`120`		`- serving, err = client.IsServing(ctx)`
`121`		`- if serving {`
`122`		`- return nil`
	`117`	`+ if client == nil {`
	`118`	`+ client, err = New(address)`
	`119`	`+ }`
	`120`	`+ if err == nil {`
	`121`	`+ serving, err = client.IsServing(ctx)`
	`122`	`+ if serving {`
	`123`	`+ return client, nil`
	`124`	`+ }`
`123`	`125`	`}`
`124`	`126`	`time.Sleep(100 * time.Millisecond)`
`125`	`127`	`}`
`126`		`- return fmt.Errorf("containerd did not start within 2s: %v", err)`
	`128`	`+ return nil, fmt.Errorf("containerd did not start within 2s: %v", err)`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`func TestNewClient(t *testing.T) {`