Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkg/helper/docker_cri_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ type CRIRuntimeWrapper struct {
dockerCenter *DockerCenter
nativeClient *containerd.Client
client cri.RuntimeServiceClient
clientConn *grpc.ClientConn
runtimeVersion *cri.VersionResponse

containersLock sync.Mutex
Expand Down Expand Up @@ -98,6 +99,7 @@ func IsCRIStatusValid(criRuntimeEndpoint string) bool {
logger.Debug(context.Background(), "Dial", addr, "failed", err)
return false
}
defer conn.Close()

client := cri.NewRuntimeServiceClient(conn)
// check cri status
Expand Down Expand Up @@ -166,33 +168,34 @@ func parseEndpoint(endpoint string) (string, string, error) {
}
}

func newRuntimeServiceClient() (cri.RuntimeServiceClient, error) {
func newRuntimeServiceClient() (cri.RuntimeServiceClient, *grpc.ClientConn, error) {
addr, dailer, err := GetAddressAndDialer("unix://" + containerdUnixSocket)
if err != nil {
return nil, err
return nil, nil, err
}

ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()

conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithDialer(dailer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
if err != nil {
return nil, err
return nil, nil, err
}

return cri.NewRuntimeServiceClient(conn), nil
return cri.NewRuntimeServiceClient(conn), conn, nil
}

// NewCRIRuntimeWrapper ...
func NewCRIRuntimeWrapper(dockerCenter *DockerCenter) (*CRIRuntimeWrapper, error) {
client, err := newRuntimeServiceClient()
client, conn, err := newRuntimeServiceClient()
if err != nil {
logger.Errorf(context.Background(), "CONNECT_CRI_RUNTIME_ALARM", "Connect remote cri-runtime failed: %v", err)
return nil, err
}

runtimeVersion, err := getCRIRuntimeVersion(client)
if err != nil {
conn.Close()
return nil, err
}

Expand All @@ -211,6 +214,7 @@ func NewCRIRuntimeWrapper(dockerCenter *DockerCenter) (*CRIRuntimeWrapper, error
return &CRIRuntimeWrapper{
dockerCenter: dockerCenter,
client: client,
clientConn: conn,
nativeClient: containerdClient,
runtimeVersion: runtimeVersion,
containers: make(map[string]*innerContainerInfo),
Expand Down
Loading