Skip to content
Open
Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions container/containerd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type client struct {
type ContainerdClient interface {
LoadContainer(ctx context.Context, id string) (*containers.Container, error)
TaskPid(ctx context.Context, id string) (uint32, error)
LoadTaskProcess(ctx context.Context, id string) (*tasktypes.Process, error)
Version(ctx context.Context) (string, error)
}

Expand Down Expand Up @@ -132,6 +133,17 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
return response.Process.Pid, nil
}

func (c *client) LoadTaskProcess(ctx context.Context, id string) (*tasktypes.Process, error) {
response, err := c.taskService.Get(ctx, &tasksapi.GetRequest{
ContainerID: id,
})
if err != nil {
return nil, errgrpc.ToNative(err)
}

return response.Process, nil
}

func (c *client) Version(ctx context.Context) (string, error) {
response, err := c.versionService.Version(ctx, &emptypb.Empty{})
if err != nil {
Expand Down
20 changes: 20 additions & 0 deletions container/containerd/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ import (
"context"
"fmt"

"github.com/containerd/containerd/api/types/task"
"github.com/google/cadvisor/container/containerd/containers"
)

type containerdClientMock struct {
cntrs map[string]*containers.Container
returnErr error
tasks map[string]*task.Process
}

func (c *containerdClientMock) LoadContainer(ctx context.Context, id string) (*containers.Container, error) {
Expand All @@ -45,9 +47,27 @@ func (c *containerdClientMock) TaskPid(ctx context.Context, id string) (uint32,
return 2389, nil
}

func (c *containerdClientMock) LoadTaskProcess(ctx context.Context, id string) (*task.Process, error) {
if c.returnErr != nil {
return nil, c.returnErr
}
task, ok := c.tasks[id]
if !ok {
return nil, fmt.Errorf("unable to find task for container %q", id)
}
return task, nil
}

func mockcontainerdClient(cntrs map[string]*containers.Container, returnErr error) ContainerdClient {
tasks := make(map[string]*task.Process)

for _, cntr := range cntrs {
tasks[cntr.ID] = &task.Process{}
}

return &containerdClientMock{
cntrs: cntrs,
returnErr: returnErr,
tasks: tasks,
}
}
Loading