Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove critical cache failure in oras GetBlobContent #1740

Merged
merged 3 commits into from
Aug 28, 2024
Merged

fix: remove critical cache failure in oras GetBlobContent #1740

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fc6814
fix: rmove critical cache failure in oras GetBlobContent
binbin-li Aug 23, 2024
ba77658
chore: add comments
binbin-li Aug 27, 2024
5ec8c95
Merge branch 'dev' into fix-oras-cache
binbin-li Aug 28, 2024
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
4 changes: 4 additions & 0 deletions pkg/referrerstore/oras/mocks/oras_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type TestStorage struct {
ExistsMap map[digest.Digest]io.Reader
ExistsErr error
FetchErr error
PushErr error
}

func (s TestStorage) Exists(_ context.Context, target oci.Descriptor) (bool, error) {
Expand All @@ -43,6 +44,9 @@ func (s TestStorage) Exists(_ context.Context, target oci.Descriptor) (bool, err
}

func (s TestStorage) Push(_ context.Context, expected oci.Descriptor, content io.Reader) error {
if s.PushErr != nil {
return s.PushErr
}
s.ExistsMap[expected.Digest] = content
return nil
}
Expand Down
22 changes: 17 additions & 5 deletions pkg/referrerstore/oras/oras.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ func (store *orasStore) ListReferrers(ctx context.Context, subjectReference comm

func (store *orasStore) GetBlobContent(ctx context.Context, subjectReference common.Reference, digest digest.Digest) ([]byte, error) {
var err error
var blobContent []byte

repository, err := store.createRepository(ctx, store, subjectReference)
if err != nil {
return nil, err
Expand All @@ -270,10 +272,18 @@ func (store *orasStore) GetBlobContent(ctx context.Context, subjectReference com
// check if blob exists in local ORAS cache
isCached, err := store.localCache.Exists(ctx, blobDescriptor)
if err != nil {
return nil, err
logger.GetLogger(ctx, logOpt).Warnf("failed to check if blob [%s] exists in cache: %v", blobDescriptor.Digest.String(), err)
susanshi marked this conversation as resolved.
Show resolved Hide resolved
}
metrics.ReportBlobCacheCount(ctx, isCached)

if isCached {
blobContent, err = store.getRawContentFromCache(ctx, blobDescriptor)
if err != nil {
isCached = false
logger.GetLogger(ctx, logOpt).Warnf("failed to get blob [%s] from cache: %v", blobDescriptor.Digest.String(), err)
}
}

if !isCached {
// generate the reference path with digest
ref := fmt.Sprintf("%s@%s", subjectReference.Path, digest)
Expand All @@ -284,16 +294,18 @@ func (store *orasStore) GetBlobContent(ctx context.Context, subjectReference com
evictOnError(ctx, err, subjectReference.Original)
return nil, err
}
if blobContent, err = io.ReadAll(rc); err != nil {
return nil, re.ErrorCodeGetBlobContentFailure.WithError(err)
}

// push fetched content to local ORAS cache
orasExistsExpectedError := fmt.Errorf("%s: %s: %w", blobDesc.Digest, blobDesc.MediaType, errdef.ErrAlreadyExists)
err = store.localCache.Push(ctx, blobDesc, rc)
if err != nil && err.Error() != orasExistsExpectedError.Error() {
return nil, err
if err = store.localCache.Push(ctx, blobDesc, bytes.NewReader(blobContent)); err != nil && err.Error() != orasExistsExpectedError.Error() {
binbin-li marked this conversation as resolved.
Show resolved Hide resolved
logger.GetLogger(ctx, logOpt).Warnf("failed to save blob [%s] in cache: %v", blobDesc.Digest, err)
}
}

return store.getRawContentFromCache(ctx, blobDescriptor)
return blobContent, nil
}

func (store *orasStore) GetReferenceManifest(ctx context.Context, subjectReference common.Reference, referenceDesc ocispecs.ReferenceDescriptor) (ocispecs.ReferenceManifest, error) {
Expand Down
Loading
Loading