MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 01:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not update metadata cache upon headObject() (#19929)

Browse Source
This commit is contained in:
jiuker 2024-06-13 23:42:02 +08:00 committed by GitHub
parent 5a5046ce45
commit 62e6dc950d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/object-handlers.go
View File

@ -959,7 +959,6 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
// No need to check cache for encrypted objects. // No need to check cache for encrypted objects.
cachedResult = false cachedResult = false
} }
var update bool
if cachedResult { if cachedResult {
rc := &cache.CondCheck{} rc := &cache.CondCheck{}
h := r.Header.Clone() h := r.Header.Clone()
@ -968,7 +967,7 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
} }
rc.Init(bucket, object, h) rc.Init(bucket, object, h)
ci, err := globalCacheConfig.Get(rc) ci, _ := globalCacheConfig.Get(rc)
if ci != nil { if ci != nil {
tgs, ok := ci.Metadata[xhttp.AmzObjectTagging] tgs, ok := ci.Metadata[xhttp.AmzObjectTagging]
if ok { if ok {
@ -1027,9 +1026,6 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
return return
} }
} }
if errors.Is(err, cache.ErrKeyMissing) {
update = true
}
} }
opts.FastGetObjInfo = true opts.FastGetObjInfo = true
@ -1053,10 +1049,6 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
} }
} }
} }
if _, ok := crypto.IsEncrypted(objInfo.UserDefined); ok {
// Never store encrypted objects in cache.
update = false
}
if objInfo.UserTags != "" { if objInfo.UserTags != "" {
// Set this such that authorization policies can be applied on the object tags. // Set this such that authorization policies can be applied on the object tags.
@ -1137,24 +1129,6 @@ func (api objectAPIHandlers) headObjectHandler(ctx context.Context, objectAPI Ob
return return
} }
if update {
asize, err := objInfo.GetActualSize()
if err != nil {
asize = objInfo.Size
}
defer globalCacheConfig.Set(&cache.ObjectInfo{
Key: objInfo.Name,
Bucket: objInfo.Bucket,
ETag: objInfo.ETag,
ModTime: objInfo.ModTime,
Expires: objInfo.ExpiresStr(),
CacheControl: objInfo.CacheControl,
Size: asize,
Metadata: cleanReservedKeys(objInfo.UserDefined),
})
}
// Validate pre-conditions if any. // Validate pre-conditions if any.
if checkPreconditions(ctx, w, r, objInfo, opts) { if checkPreconditions(ctx, w, r, objInfo, opts) {
return return