All handlers of containerd containers share a single client instance

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
This commit is contained in:
Yanqiang Miao 2018-02-07 16:13:22 +08:00
parent aa6d6f1195
commit 1dd9469469

View File

@ -16,6 +16,7 @@ package containerd
import ( import (
"context" "context"
"sync"
"time" "time"
containersapi "github.com/containerd/containerd/api/services/containers/v1" containersapi "github.com/containerd/containerd/api/services/containers/v1"
@ -45,32 +46,38 @@ type containerdClient interface {
Version(ctx context.Context) (string, error) Version(ctx context.Context) (string, error)
} }
var once sync.Once
var ctrdClient containerdClient = nil
// Client creates a containerd client // Client creates a containerd client
func Client() (containerdClient, error) { func Client() (containerdClient, error) {
gopts := []grpc.DialOption{ var retErr error
grpc.WithInsecure(), once.Do(func() {
grpc.FailOnNonTempDialError(true), gopts := []grpc.DialOption{
grpc.WithDialer(dialer.Dialer), grpc.WithInsecure(),
grpc.WithBlock(), grpc.WithDialer(dialer.Dialer),
grpc.WithTimeout(2 * time.Second), grpc.WithBlock(),
grpc.WithBackoffMaxDelay(3 * time.Second), grpc.WithTimeout(2 * time.Second),
} grpc.WithBackoffMaxDelay(3 * time.Second),
unary, stream := newNSInterceptors(k8sNamespace) }
gopts = append(gopts, unary, stream := newNSInterceptors(k8sNamespace)
grpc.WithUnaryInterceptor(unary), gopts = append(gopts,
grpc.WithStreamInterceptor(stream), grpc.WithUnaryInterceptor(unary),
) grpc.WithStreamInterceptor(stream),
)
conn, err := grpc.Dial(dialer.DialAddress("/var/run/containerd/containerd.sock"), gopts...) conn, err := grpc.Dial(dialer.DialAddress("/var/run/containerd/containerd.sock"), gopts...)
if err != nil { if err != nil {
return nil, err retErr = err
} return
c := &client{ }
containerService: containersapi.NewContainersClient(conn), ctrdClient = &client{
taskService: tasksapi.NewTasksClient(conn), containerService: containersapi.NewContainersClient(conn),
versionService: versionapi.NewVersionClient(conn), taskService: tasksapi.NewTasksClient(conn),
} versionService: versionapi.NewVersionClient(conn),
return c, err }
})
return ctrdClient, retErr
} }
func (c *client) LoadContainer(ctx context.Context, id string) (*containers.Container, error) { func (c *client) LoadContainer(ctx context.Context, id string) (*containers.Container, error) {