add truncindex

fix #222

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>

pkg/server/container_attach.go

@@ -52,7 +52,7 @@ func (c *criContainerdService) attachContainer(ctx context.Context, id string, s
 	// Get container from our container store.
 	cntr, err := c.containerStore.Get(id)
 	if err != nil {
-		return fmt.Errorf("failed to find container in store: %v", err)
+		return fmt.Errorf("failed to find container %q in store: %v", id, err)
 	}
 	id = cntr.ID
 

pkg/server/container_exec.go

@@ -27,7 +27,7 @@ import (
 func (c *criContainerdService) Exec(ctx context.Context, r *runtime.ExecRequest) (*runtime.ExecResponse, error) {
 	cntr, err := c.containerStore.Get(r.GetContainerId())
 	if err != nil {
-		return nil, fmt.Errorf("failed to find container in store: %v", err)
+		return nil, fmt.Errorf("failed to find container %q in store: %v", r.GetContainerId(), err)
 	}
 	state := cntr.Status.Get().State()
 	if state != runtime.ContainerState_CONTAINER_RUNNING {

pkg/server/container_execsync.go

@@ -78,7 +78,7 @@ func (c *criContainerdService) execInContainer(ctx context.Context, id string, o
 	// Get container from our container store.
 	cntr, err := c.containerStore.Get(id)
 	if err != nil {
-		return nil, fmt.Errorf("failed to find container in store: %v", err)
+		return nil, fmt.Errorf("failed to find container %q in store: %v", id, err)
 	}
 	id = cntr.ID
 

pkg/server/image_pull.go

@@ -142,7 +142,9 @@ func (c *criContainerdService) PullImage(ctx context.Context, r *runtime.PullIma
 		img.RepoTags = []string{repoTag}
 	}
 
-	c.imageStore.Add(img)
+	if err := c.imageStore.Add(img); err != nil {
+		return nil, fmt.Errorf("failed to add image %q into store: %v", img.ID, err)
+	}
 
 	// NOTE(random-liu): the actual state in containerd is the source of truth, even we maintain
 	// in-memory image store, it's only for in-memory indexing. The image could be removed

pkg/server/restart.go

@@ -101,8 +101,10 @@ func (c *criContainerdService) recover(ctx context.Context) error {
 		return fmt.Errorf("failed to load images: %v", err)
 	}
 	for _, image := range images {
-		c.imageStore.Add(image)
 		glog.V(4).Infof("Loaded image %+v", image)
+		if err := c.imageStore.Add(image); err != nil {
+			return fmt.Errorf("failed to add image %q to store: %v", image.ID, err)
+		}
 	}
 
 	// It's possible that containerd containers are deleted unexpectedly. In that case,

pkg/server/sandbox_portforward.go

@@ -35,7 +35,7 @@ func (c *criContainerdService) PortForward(ctx context.Context, r *runtime.PortF
 	// TODO(random-liu): Run a socat container inside the sandbox to do portforward.
 	sandbox, err := c.sandboxStore.Get(r.GetPodSandboxId())
 	if err != nil {
-		return nil, fmt.Errorf("failed to find sandbox: %v", err)
+		return nil, fmt.Errorf("failed to find sandbox %q: %v", r.GetPodSandboxId(), err)
 	}
 
 	t, err := sandbox.Container.Task(ctx, nil)
@@ -59,7 +59,7 @@ func (c *criContainerdService) PortForward(ctx context.Context, r *runtime.PortF
 func (c *criContainerdService) portForward(id string, port int32, stream io.ReadWriteCloser) error {
 	s, err := c.sandboxStore.Get(id)
 	if err != nil {
-		return fmt.Errorf("failed to find sandbox in store: %v", err)
+		return fmt.Errorf("failed to find sandbox %q in store: %v", id, err)
 	}
 	t, err := s.Container.Task(context.Background(), nil)
 	if err != nil {