Image list optimization

Signed-off-by: apostasie <spam_blackhole@farcloser.world>

pkg/cmd/container/inspect.go

@@ -28,6 +28,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/containerinspector"
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
+	"github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 )
 
@@ -36,7 +37,7 @@ func Inspect(ctx context.Context, client *containerd.Client, containers []string
 	f := &containerInspector{
 		mode:        options.Mode,
 		size:        options.Size,
-		snapshotter: client.SnapshotService(options.GOptions.Snapshotter),
+		snapshotter: imgutil.SnapshotServiceWithCache(client.SnapshotService(options.GOptions.Snapshotter)),
 	}
 
 	walker := &containerwalker.ContainerWalker{
@@ -61,39 +62,6 @@ type containerInspector struct {
 	entries     []interface{}
 }
 
-// resourceTotal will return:
-// - the Usage value of the resource referenced by ID
-// - the cumulative Usage value of the resource, and all parents, recursively
-// Typically, for a running container, this will equal the size of the read-write layer, plus the sum of the size of all layers in the base image
-func resourceTotal(ctx context.Context, snapshotter snapshots.Snapshotter, resourceID string) (snapshots.Usage, snapshots.Usage, error) {
-	var first snapshots.Usage
-	var total snapshots.Usage
-	var info snapshots.Info
-
-	for next := resourceID; next != ""; next = info.Parent {
-		// Get the resource usage info
-		usage, err := snapshotter.Usage(ctx, next)
-		if err != nil {
-			return first, total, err
-		}
-		// In case that's the first one, store that
-		if next == resourceID {
-			first = usage
-		}
-		// And increment totals
-		total.Size += usage.Size
-		total.Inodes += usage.Inodes
-
-		// Now, get the parent, if any and iterate
-		info, err = snapshotter.Stat(ctx, next)
-		if err != nil {
-			return first, total, err
-		}
-	}
-
-	return first, total, nil
-}
-
 func (x *containerInspector) Handler(ctx context.Context, found containerwalker.Found) error {
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
@@ -111,7 +79,7 @@ func (x *containerInspector) Handler(ctx context.Context, found containerwalker.
 			return err
 		}
 		if x.size {
-			resourceUsage, allResourceUsage, err := resourceTotal(ctx, x.snapshotter, d.ID)
+			resourceUsage, allResourceUsage, err := imgutil.ResourceUsage(ctx, x.snapshotter, d.ID)
 			if err == nil {
 				d.SizeRw = &resourceUsage.Size
 				d.SizeRootFs = &allResourceUsage.Size

pkg/cmd/container/list.go

@@ -25,9 +25,9 @@ import (
 	"time"
 
 	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/pkg/progress"
+	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/log"
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
@@ -107,6 +107,7 @@ func (x *ListItem) Label(s string) string {
 
 func prepareContainers(ctx context.Context, client *containerd.Client, containers []containerd.Container, options types.ContainerListOptions) ([]ListItem, error) {
 	listItems := make([]ListItem, len(containers))
+	snapshottersCache := map[string]snapshots.Snapshotter{}
 	for i, c := range containers {
 		info, err := c.Info(ctx, containerd.WithoutRefreshedMetadata)
 		if err != nil {
@@ -141,7 +142,12 @@ func prepareContainers(ctx context.Context, client *containerd.Client, container
 			Labels:    info.Labels,
 		}
 		if options.Size {
-			containerSize, err := getContainerSize(ctx, client, c, info)
+			snapshotter, ok := snapshottersCache[info.Snapshotter]
+			if !ok {
+				snapshottersCache[info.Snapshotter] = imgutil.SnapshotServiceWithCache(client.SnapshotService(info.Snapshotter))
+				snapshotter = snapshottersCache[info.Snapshotter]
+			}
+			containerSize, err := getContainerSize(ctx, snapshotter, info.SnapshotKey)
 			if err != nil {
 				return nil, err
 			}
@@ -180,30 +186,18 @@ func getContainerNetworks(containerLables map[string]string) []string {
 	return networks
 }
 
-func getContainerSize(ctx context.Context, client *containerd.Client, c containerd.Container, info containers.Container) (string, error) {
+func getContainerSize(ctx context.Context, snapshotter snapshots.Snapshotter, snapshotKey string) (string, error) {
 	// get container snapshot size
-	snapshotKey := info.SnapshotKey
 	var containerSize int64
+	var imageSize int64
 
 	if snapshotKey != "" {
-		usage, err := client.SnapshotService(info.Snapshotter).Usage(ctx, snapshotKey)
+		rw, all, err := imgutil.ResourceUsage(ctx, snapshotter, snapshotKey)
 		if err != nil {
 			return "", err
 		}
-		containerSize = usage.Size
-	}
-
-	// get the image interface
-	image, err := c.Image(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	sn := client.SnapshotService(info.Snapshotter)
-
-	imageSize, err := imgutil.UnpackedImageSize(ctx, sn, image)
-	if err != nil {
-		return "", err
+		containerSize = rw.Size
+		imageSize = all.Size
 	}
 
 	return fmt.Sprintf("%s (virtual %s)", progress.Bytes(containerSize).String(), progress.Bytes(imageSize).String()), nil

pkg/cmd/image/inspect.go

@@ -27,6 +27,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/imagewalker"
 	"github.com/containerd/nerdctl/v2/pkg/imageinspector"
+	"github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 )
 
@@ -35,13 +36,14 @@ func Inspect(ctx context.Context, client *containerd.Client, images []string, op
 	f := &imageInspector{
 		mode: options.Mode,
 	}
+	snapshotter := imgutil.SnapshotServiceWithCache(client.SnapshotService(options.GOptions.Snapshotter))
 	walker := &imagewalker.ImageWalker{
 		Client: client,
 		OnFound: func(ctx context.Context, found imagewalker.Found) error {
 			ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 			defer cancel()
 
-			n, err := imageinspector.Inspect(ctx, client, found.Image, options.GOptions.Snapshotter)
+			n, err := imageinspector.Inspect(ctx, client, found.Image, snapshotter)
 			if err != nil {
 				return err
 			}