github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 04:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: cleanup error msgs (#1273)

Browse Source 
Signed-off-by: Nicol Draghici <idraghic@cisco.com>
This commit is contained in:
Nicol
2023-03-20 21:42:36 +02:00
committed by GitHub
parent ddbb56178e
commit 0842b02181
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/cache/dynamodb.go
Vendored
+2 -2
View File
@@ -173,7 +173,7 @@ func (d *DynamoDBDriver) HasBlob(digest godigest.Digest, path string) bool {
out := Blob{}
if resp.Item == nil {
d.log.Error().Err(zerr.ErrCacheMiss)
d.log.Debug().Err(zerr.ErrCacheMiss).Str("digest", string(digest)).Msg("unable to find blob in cache")
return false
}
@@ -186,7 +186,7 @@ func (d *DynamoDBDriver) HasBlob(digest godigest.Digest, path string) bool {
}
}
d.log.Error().Err(zerr.ErrCacheMiss)
d.log.Debug().Err(zerr.ErrCacheMiss).Str("digest", string(digest)).Msg("unable to find blob in cache")
return false
}
pkg/storage/local/local.go
+16 -12
View File
@@ -986,7 +986,7 @@ retry:
dstRecordFi, err := os.Stat(dstRecord)
if err != nil {
is.log.Error().Err(err).Str("blobPath", dstRecord).Msg("dedupe: unable to stat")
is.log.Warn().Err(err).Str("blobPath", dstRecord).Msg("dedupe: unable to stat cache record, removing it")
// the actual blob on disk may have been removed by GC, so sync the cache
if err := is.cache.DeleteBlob(dstDigest, dstRecord); err != nil {
//nolint:lll // gofumpt conflicts with lll
@@ -1076,13 +1076,11 @@ func (is *ImageStoreLocal) CheckBlob(repo string, digest godigest.Digest) (bool,
return true, binfo.Size(), nil
}
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to find blob, searching it in cache")
// Check blobs in cache
dstRecord, err := is.checkCacheBlob(digest)
if err != nil {
is.log.Error().Err(err).Str("digest", digest.String()).Msg("cache: not found")
return false, -1, zerr.ErrBlobNotFound
}
@@ -1112,13 +1110,19 @@ func (is *ImageStoreLocal) checkCacheBlob(digest godigest.Digest) (string, error
dstRecord, err := is.cache.GetBlob(digest)
if err != nil {
if errors.Is(err, zerr.ErrCacheMiss) {
is.log.Debug().Err(err).Str("digest", string(digest)).Msg("unable to find blob in cache")
} else {
is.log.Error().Err(err).Str("digest", string(digest)).Msg("unable to search blob in cache")
}
return "", err
}
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")
is.log.Warn().Err(err).Str("blob", dstRecord).Msg("unable to stat cache record, removing it")
// the actual blob on disk may have been removed by GC, so sync the cache
if err := is.cache.DeleteBlob(digest, dstRecord); err != nil {
@@ -1214,7 +1218,7 @@ func (is *ImageStoreLocal) GetBlobPartial(repo string, digest godigest.Digest, m
binfo, err := os.Stat(blobPath)
if err != nil {
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
return nil, -1, -1, zerr.ErrBlobNotFound
}
@@ -1225,7 +1229,7 @@ func (is *ImageStoreLocal) GetBlobPartial(repo string, digest godigest.Digest, m
blobReadCloser, err := newBlobStream(blobPath, from, to)
if err != nil {
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to open blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to open blob")
return nil, -1, -1, err
}
@@ -1251,14 +1255,14 @@ func (is *ImageStoreLocal) GetBlob(repo string, digest godigest.Digest, mediaTyp
binfo, err := os.Stat(blobPath)
if err != nil {
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
return nil, -1, zerr.ErrBlobNotFound
}
blobReadCloser, err := os.Open(blobPath)
if err != nil {
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to open blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to open blob")
return nil, -1, err
}
@@ -1278,7 +1282,7 @@ func (is *ImageStoreLocal) GetBlobContent(repo string, digest godigest.Digest) (
blob, err := os.ReadFile(blobPath)
if err != nil {
if os.IsNotExist(err) {
is.log.Error().Err(err).Str("blob", blobPath).Msg("blob doesn't exist")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("blob doesn't exist")
return []byte{}, zerr.ErrBlobNotFound
}
@@ -1298,7 +1302,7 @@ func (is *ImageStoreLocal) GetIndexContent(repo string) ([]byte, error) {
buf, err := os.ReadFile(path.Join(dir, "index.json"))
if err != nil {
if os.IsNotExist(err) {
is.log.Error().Err(err).Str("dir", dir).Msg("index.json doesn't exist")
is.log.Debug().Err(err).Str("dir", dir).Msg("index.json doesn't exist")
return []byte{}, zerr.ErrRepoNotFound
}
@@ -1326,7 +1330,7 @@ func (is *ImageStoreLocal) DeleteBlob(repo string, digest godigest.Digest) error
_, err := os.Stat(blobPath)
if err != nil {
is.log.Error().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
is.log.Debug().Err(err).Str("blob", blobPath).Msg("failed to stat blob")
return zerr.ErrBlobNotFound
}