Merge pull request #2663 from crosbymichael/publish

dmcgowan · web-flow · commit 5600adc86dd3 · 2018-09-19T10:51:55.000-07:00
Reduce publish connection timeout
diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go
@@ -99,7 +99,7 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (*
 		grpc.FailOnNonTempDialError(true),
 		grpc.WithBackoffMaxDelay(3 * time.Second),
 	}
-	ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 60*time.Second)
+	ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 2*time.Second)
 	defer cancel()
 	conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (*`
`99`	`99`	`grpc.FailOnNonTempDialError(true),`
`100`	`100`	`grpc.WithBackoffMaxDelay(3 * time.Second),`
`101`	`101`	`}`
`102`		`- ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 60*time.Second)`
	`102`	`+ ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 2*time.Second)`
`103`	`103`	`defer cancel()`
`104`	`104`	`conn, err := grpc.DialContext(ctx, dialer.DialAddress(address), gopts...)`
`105`	`105`	`if err != nil {`