TrueCloudLab
/
frostfs-s3-gw
16
2
Fork 14
Code Issues 19 Pull Requests 4 Actions Packages Releases 6 Activity

[#306] Fix forming key for bucket cache 

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
pull/326/head
Denis Kirillov 2024-03-01 16:09:33 +03:00
parent fabb4134bc
commit e9f38a49e4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/cache/buckets.go vendored
View File

@ -65,6 +65,6 @@ func (o *BucketCache) Delete(bkt *data.BucketInfo) bool {
return o.cache.Remove(formKey(bkt.Zone, bkt.Name))
}
func formKey(ns, name string) string {
return name + "." + ns
func formKey(zone, name string) string {
return name + "." + zone
}

4
api/layer/cache.go
View File

@ -60,8 +60,8 @@ func NewCache(cfg *CachesConfig) *Cache {
}
}
func (c *Cache) GetBucket(ns, name string) *data.BucketInfo {
return c.bucketCache.Get(ns, name)
func (c *Cache) GetBucket(zone, name string) *data.BucketInfo {
return c.bucketCache.Get(zone, name)
}
func (c *Cache) PutBucket(bktInfo *data.BucketInfo) {

3
api/layer/layer.go
View File

@ -404,8 +404,9 @@ func (n *layer) GetBucketInfo(ctx context.Context, name string) (*data.BucketInf
}
reqInfo := middleware.GetReqInfo(ctx)
zone, _ := n.features.FormContainerZone(reqInfo.Namespace)
if bktInfo := n.cache.GetBucket(reqInfo.Namespace, name); bktInfo != nil {
if bktInfo := n.cache.GetBucket(zone, name); bktInfo != nil {
return bktInfo, nil
}