fix(storage): resolve cache/storage inconsistencies on HEAD request (#…

…794) Signed-off-by: Petu Eusebiu <[email protected]>
project-zot · Oct 11, 2022 · fd87a22 · fd87a22
1 parent f3b1913
commit fd87a22
Show file tree

Hide file tree

Showing 3 changed files with 416 additions and 396 deletions.
diff --git a/pkg/storage/local/local.go b/pkg/storage/local/local.go
@@ -1104,6 +1104,19 @@ func (is *ImageStoreLocal) checkCacheBlob(digest string) (string, error) {
 
 	dstRecord = path.Join(is.rootDir, dstRecord)
 
+	if _, err := os.Stat(dstRecord); err != nil {
+		is.log.Error().Err(err).Str("blob", dstRecord).Msg("failed to stat blob")
+
+		// the actual blob on disk may have been removed by GC, so sync the cache
+		if err := is.cache.DeleteBlob(digest, dstRecord); err != nil {
+			is.log.Error().Err(err).Str("digest", digest).Str("blobPath", dstRecord).Msg("unable to remove blob path from cache")
+
+			return "", err
+		}
+
+		return "", zerr.ErrBlobNotFound
+	}
+
 	is.log.Debug().Str("digest", digest).Str("dstRecord", dstRecord).Msg("cache: found dedupe record")
 
 	return dstRecord, nil

diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go
@@ -1055,6 +1055,19 @@ func (is *ObjectStorage) checkCacheBlob(digest string) (string, error) {
 		return "", err
 	}
 
+	if _, err := is.store.Stat(context.Background(), dstRecord); err != nil {
+		is.log.Error().Err(err).Str("blob", dstRecord).Msg("failed to stat blob")
+
+		// the actual blob on disk may have been removed by GC, so sync the cache
+		if err := is.cache.DeleteBlob(digest, dstRecord); err != nil {
+			is.log.Error().Err(err).Str("digest", digest).Str("blobPath", dstRecord).Msg("unable to remove blob path from cache")
+
+			return "", err
+		}
+
+		return "", zerr.ErrBlobNotFound
+	}
+
 	is.log.Debug().Str("digest", digest).Str("dstRecord", dstRecord).Msg("cache: found dedupe record")
 
 	return dstRecord, nil
@@ -1161,13 +1174,6 @@ func (is *ObjectStorage) GetBlobPartial(repo, digest, mediaType string, from, to
 		if err != nil {
 			is.log.Error().Err(err).Str("blob", dstRecord).Msg("failed to stat blob")
 
-			// the actual blob on disk may have been removed by GC, so sync the cache
-			if err := is.cache.DeleteBlob(digest, dstRecord); err != nil {
-				is.log.Error().Err(err).Str("dstDigest", digest).Str("dst", dstRecord).Msg("dedupe: unable to delete blob record")
-
-				return nil, -1, -1, err
-			}
-
 			return nil, -1, -1, zerr.ErrBlobNotFound
 		}
 
@@ -1243,13 +1249,6 @@ func (is *ObjectStorage) GetBlob(repo, digest, mediaType string) (io.ReadCloser,
 		if err != nil {
 			is.log.Error().Err(err).Str("blob", dstRecord).Msg("failed to stat blob")
 
-			// the actual blob on disk may have been removed by GC, so sync the cache
-			if err := is.cache.DeleteBlob(digest, dstRecord); err != nil {
-				is.log.Error().Err(err).Str("dstDigest", digest).Str("dst", dstRecord).Msg("dedupe: unable to delete blob record")
-
-				return nil, -1, err
-			}
-
 			return nil, -1, zerr.ErrBlobNotFound
 		}