From 20af59f18c0a80f3e34aa6cfc832d6f7f5434fd5 Mon Sep 17 00:00:00 2001 From: Xiaoxuan Wang Date: Thu, 11 Jan 2024 09:52:03 +0800 Subject: [PATCH] resolved comments Signed-off-by: Xiaoxuan Wang --- content/oci/oci.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/content/oci/oci.go b/content/oci/oci.go index c0b19c4a..ccefc0d9 100644 --- a/content/oci/oci.go +++ b/content/oci/oci.go @@ -485,7 +485,7 @@ func (s *Store) GC(ctx context.Context) error { reachableNodes := s.graph.DigestSet() // clean up garbage blobs in the storage - rootpath := filepath.Join(s.root, "blobs") + rootpath := filepath.Join(s.root, ocispec.ImageBlobsDir) algDirs, err := os.ReadDir(rootpath) if err != nil { return err @@ -510,9 +510,8 @@ func (s *Store) GC(ctx context.Context) error { } dgst := digestEntry.Name() blobDigest := digest.NewDigestFromEncoded(digest.Algorithm(alg), dgst) - err := blobDigest.Validate() - // skip irrelevant content - if err != nil { + if err := blobDigest.Validate(); err != nil { + // skip irrelevant content continue } if !reachableNodes.Contains(blobDigest) {