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

remove taskService and imageStoreService

Browse Source 
Signed-off-by: yason <yan.xuean@zte.com.cn>
This commit is contained in:
yason 2017-12-12 16:40:22 +08:00
parent 41c8763e2b
commit 4762b3e273
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/container_stats.go
View File

@ -32,7 +32,7 @@ func (c *criContainerdService) ContainerStats(ctx context.Context, in *runtime.C
return nil, fmt.Errorf("failed to find container: %v", err) return nil, fmt.Errorf("failed to find container: %v", err)
} }
request := &tasks.MetricsRequest{Filters: []string{"id==" + cntr.ID}} request := &tasks.MetricsRequest{Filters: []string{"id==" + cntr.ID}}
resp, err := c.taskService.Metrics(ctx, request) resp, err := c.client.TaskService().Metrics(ctx, request)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch metrics for task: %v", err) return nil, fmt.Errorf("failed to fetch metrics for task: %v", err)
} }

2
pkg/server/container_stats_list.go
View File

@ -38,7 +38,7 @@ func (c *criContainerdService) ListContainerStats(
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to build metrics request: %v", err) return nil, fmt.Errorf("failed to build metrics request: %v", err)
} }
resp, err := c.taskService.Metrics(ctx, &request) resp, err := c.client.TaskService().Metrics(ctx, &request)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to fetch metrics for tasks: %v", err) return nil, fmt.Errorf("failed to fetch metrics for tasks: %v", err)
} }

4
pkg/server/image_pull.go
View File

@ -199,13 +199,13 @@ func (c *criContainerdService) createImageReference(ctx context.Context, name st
} }
// TODO(random-liu): Figure out which is the more performant sequence create then update or // TODO(random-liu): Figure out which is the more performant sequence create then update or
// update then create. // update then create.
_, err := c.imageStoreService.Create(ctx, img) _, err := c.client.ImageService().Create(ctx, img)
if err == nil { if err == nil {
return nil return nil
} }
if err != nil && !errdefs.IsAlreadyExists(err) { if err != nil && !errdefs.IsAlreadyExists(err) {
return err return err
} }
_, err = c.imageStoreService.Update(ctx, img, "target") _, err = c.client.ImageService().Update(ctx, img, "target")
return err return err
} }

4
pkg/server/image_remove.go
View File

@ -65,14 +65,14 @@ func (c *criContainerdService) RemoveImage(ctx context.Context, r *runtime.Remov
// Include all image references, including RepoTag, RepoDigest and id. // Include all image references, including RepoTag, RepoDigest and id.
for _, ref := range append(image.RepoTags, image.RepoDigests...) { for _, ref := range append(image.RepoTags, image.RepoDigests...) {
err = c.imageStoreService.Delete(ctx, ref) err = c.client.ImageService().Delete(ctx, ref)
if err == nil || errdefs.IsNotFound(err) { if err == nil || errdefs.IsNotFound(err) {
continue continue
} }
return nil, fmt.Errorf("failed to delete image reference %q for image %q: %v", ref, image.ID, err) return nil, fmt.Errorf("failed to delete image reference %q for image %q: %v", ref, image.ID, err)
} }
// Delete image id synchronously to trigger garbage collection. // Delete image id synchronously to trigger garbage collection.
err = c.imageStoreService.Delete(ctx, image.ID, images.SynchronousDelete()) err = c.client.ImageService().Delete(ctx, image.ID, images.SynchronousDelete())
if err != nil && !errdefs.IsNotFound(err) { if err != nil && !errdefs.IsNotFound(err) {
return nil, fmt.Errorf("failed to delete image id %q: %v", image.ID, err) return nil, fmt.Errorf("failed to delete image id %q: %v", image.ID, err)
} }

2
pkg/server/sandbox_list.go
View File

@ -34,7 +34,7 @@ func (c *criContainerdService) ListPodSandbox(ctx context.Context, r *runtime.Li
// List all sandboxes from store. // List all sandboxes from store.
sandboxesInStore := c.sandboxStore.List() sandboxesInStore := c.sandboxStore.List()
response, err := c.taskService.List(ctx, &tasks.ListTasksRequest{}) response, err := c.client.TaskService().List(ctx, &tasks.ListTasksRequest{})
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to list sandbox containers: %v", err) return nil, fmt.Errorf("failed to list sandbox containers: %v", err)
} }

9
pkg/server/service.go
View File

@ -25,8 +25,6 @@ import (
"time" "time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
"github.com/cri-o/ocicni/pkg/ocicni" "github.com/cri-o/ocicni/pkg/ocicni"
@ -93,11 +91,6 @@ type criContainerdService struct {
imageStore *imagestore.Store imageStore *imagestore.Store
// snapshotStore stores information of all snapshots. // snapshotStore stores information of all snapshots.
snapshotStore *snapshotstore.Store snapshotStore *snapshotstore.Store
// taskService is containerd tasks client.
taskService tasks.TasksClient
// imageStoreService is the containerd service to store and track
// image metadata.
imageStoreService images.Store
// netPlugin is used to setup and teardown network when run/stop pod sandbox. // netPlugin is used to setup and teardown network when run/stop pod sandbox.
netPlugin ocicni.CNIPlugin netPlugin ocicni.CNIPlugin
// client is an instance of the containerd client // client is an instance of the containerd client
@ -138,8 +131,6 @@ func NewCRIContainerdService(config options.Config) (CRIContainerdService, error
snapshotStore: snapshotstore.NewStore(), snapshotStore: snapshotstore.NewStore(),
sandboxNameIndex: registrar.NewRegistrar(), sandboxNameIndex: registrar.NewRegistrar(),
containerNameIndex: registrar.NewRegistrar(), containerNameIndex: registrar.NewRegistrar(),
taskService: client.TaskService(),
imageStoreService: client.ImageService(),
client: client, client: client,
} }