TrueCloudLab/xk6-frostfs
42
1
Fork 20
Code Issues 34 Pull requests 2 Releases Activity Actions

[#194] s3local: Change fixedBucketResolver behavior #194

Open
dkirillov wants to merge 1 commit from dkirillov/xk6-frostfs:bugfix/correct_local_bucket_resolving into master
pull from: dkirillov/xk6-frostfs:bugfix/correct_local_bucket_resolving
merge into: TrueCloudLab:master
Conversation 3 Commits 1 Files changed 2 +6 -7
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/s3local/client.go
View file

@ -5,7 +5,6 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data"
"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer"
v2container "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/api/container"
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
"git.frostfs.info/TrueCloudLab/xk6-frostfs/internal/datagen"
"git.frostfs.info/TrueCloudLab/xk6-frostfs/internal/local"
@ -18,7 +17,7 @@ type Client struct {
vu modules.VU
l *layer.Layer
ownerID *user.ID
resolver layer.BucketResolver
resolver fixedBucketResolver
limiter local.Limiter
}
@ -43,7 +42,7 @@ func (c *Client) Put(bucket, key string, payload datagen.Payload) PutResponse {
Error: "engine size limit reached",
}
}
cid, err := c.resolver.Resolve(c.vu.Context(), v2container.SysAttributeZoneDefault, bucket)
cid, err := c.resolver.Resolve(c.vu.Context(), "", bucket)
if err != nil {
stats.Report(c.vu, objPutFails, 1)
return PutResponse{Error: err.Error()}
@ -79,7 +78,7 @@ func (c *Client) Put(bucket, key string, payload datagen.Payload) PutResponse {
}
func (c *Client) Get(bucket, key string) GetResponse {
cid, err := c.resolver.Resolve(c.vu.Context(), v2container.SysAttributeZoneDefault, bucket)
cid, err := c.resolver.Resolve(c.vu.Context(), "", bucket)
if err != nil {
stats.Report(c.vu, objGetFails, 1)
return GetResponse{Error: err.Error()}

6
internal/s3local/resolver.go
View file

@ -24,9 +24,9 @@ func newFixedBucketResolver(bucketMapping map[string]string) (fixedBucketResolve
return r, nil
}
func (r fixedBucketResolver) Resolve(_ context.Context, zone, bucket string) (cid.ID, error) {
if cnrID, resolved := r[zone+"/"+bucket]; resolved {
func (r fixedBucketResolver) Resolve(_ context.Context, _, bucket string) (cid.ID, error) {
if cnrID, resolved := r[bucket]; resolved {
return cnrID, nil
}
return cid.ID{}, fmt.Errorf("zone %s and bucket %s is not mapped to any container", zone, bucket)
return cid.ID{}, fmt.Errorf("bucket %s is not mapped to any container", bucket)
}