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

Merge pull request #8488 from helen-frank/feature/cacheDiffIDs

Browse Source 
cache image diffIDs
This commit is contained in:
Phil Estes 2023-05-10 15:23:09 -07:00 committed by GitHub
commit f84b2b47b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
image.go
View File

@ -22,6 +22,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"strings" "strings"
"sync"
"sync/atomic" "sync/atomic"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
@ -137,6 +138,9 @@ type image struct {
i images.Image i images.Image
platform platforms.MatchComparer platform platforms.MatchComparer
diffIDs []digest.Digest
mu sync.Mutex
} }
func (i *image) Metadata() images.Image { func (i *image) Metadata() images.Image {
@ -156,8 +160,19 @@ func (i *image) Labels() map[string]string {
} }
func (i *image) RootFS(ctx context.Context) ([]digest.Digest, error) { func (i *image) RootFS(ctx context.Context) ([]digest.Digest, error) {
i.mu.Lock()
defer i.mu.Unlock()
if i.diffIDs != nil {
return i.diffIDs, nil
}
provider := i.client.ContentStore() provider := i.client.ContentStore()
return i.i.RootFS(ctx, provider, i.platform) diffIDs, err := i.i.RootFS(ctx, provider, i.platform)
if err != nil {
return nil, err
}
i.diffIDs = diffIDs
return diffIDs, nil
} }
func (i *image) Size(ctx context.Context) (int64, error) { func (i *image) Size(ctx context.Context) (int64, error) {
@ -264,9 +279,8 @@ func (i *image) IsUnpacked(ctx context.Context, snapshotterName string) (bool, e
if err != nil { if err != nil {
return false, err return false, err
} }
cs := i.client.ContentStore()
diffs, err := i.i.RootFS(ctx, cs, i.platform) diffs, err := i.RootFS(ctx)
if err != nil { if err != nil {
return false, err return false, err
} }
@ -355,7 +369,7 @@ func (i *image) Unpack(ctx context.Context, snapshotterName string, opts ...Unpa
return err return err
} }
layers, err := i.getLayers(ctx, i.platform, manifest) layers, err := i.getLayers(ctx, manifest)
if err != nil { if err != nil {
return err return err
} }
@ -431,9 +445,8 @@ func (i *image) getManifest(ctx context.Context, platform platforms.MatchCompare
return manifest, nil return manifest, nil
} }
func (i *image) getLayers(ctx context.Context, platform platforms.MatchComparer, manifest ocispec.Manifest) ([]rootfs.Layer, error) { func (i *image) getLayers(ctx context.Context, manifest ocispec.Manifest) ([]rootfs.Layer, error) {
cs := i.ContentStore() diffIDs, err := i.RootFS(ctx)
diffIDs, err := i.i.RootFS(ctx, cs, platform)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to resolve rootfs: %w", err) return nil, fmt.Errorf("failed to resolve rootfs: %w", err)
} }