github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7189 from zouyee/ctx

Browse Source
This commit is contained in:
Fu Wei 2022-07-22 11:09:02 +08:00 committed by GitHub
commit badb66113c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/ttrpcutil/client.go
View File

@ -17,6 +17,7 @@
package ttrpcutil package ttrpcutil
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"sync" "sync"
@ -42,7 +43,9 @@ type Client struct {
// NewClient returns a new containerd TTRPC client that is connected to the containerd instance provided by address // NewClient returns a new containerd TTRPC client that is connected to the containerd instance provided by address
func NewClient(address string, opts ...ttrpc.ClientOpts) (*Client, error) { func NewClient(address string, opts ...ttrpc.ClientOpts) (*Client, error) {
connector := func() (*ttrpc.Client, error) { connector := func() (*ttrpc.Client, error) {
conn, err := dialer.Dialer(address, ttrpcDialTimeout) ctx, cancel := context.WithTimeout(context.Background(), ttrpcDialTimeout)
defer cancel()
conn, err := dialer.ContextDialer(ctx, address)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to connect: %w", err) return nil, fmt.Errorf("failed to connect: %w", err)
} }