realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#407] Add service tree client prototype

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2022-04-22 10:18:21 +03:00 • committed by Alex Vanin
parent d7f77ce874
commit 9ed081db3e
11 changed files with 724 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

34
api/layer/system_object.go
View file

@ -1,11 +1,10 @@
package layer
import (
"bytes"
"context"
"encoding/hex"
"encoding/json"
"encoding/xml"
errorsStd "errors"
"fmt"
"strconv"
"time"
@ -253,22 +252,17 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
return settings, nil
}
settings := &data.BucketSettings{}
obj, err := n.getSystemObjectFromNeoFS(ctx, bktInfo, bktInfo.SettingsObjectName())
settings, err := n.treeService.GetSettingsNode(ctx, &bktInfo.CID, "version")
if err != nil {
if !errors.IsS3Error(err, errors.ErrNoSuchKey) {
if !errorsStd.Is(err, ErrNotFound) {
return nil, err
}
settings = &data.BucketSettings{}
settings.IsNoneStatus = true
} else if err = json.Unmarshal(obj.Payload(), settings); err != nil {
return nil, fmt.Errorf("unmarshal settings: %w", err)
}
if err = n.systemCache.PutSettings(systemKey, settings); err != nil {
objID, _ := obj.ID()
n.log.Warn("couldn't put system meta to objects cache",
zap.Stringer("object id", &objID),
zap.Stringer("bucket id", bktInfo.CID),
zap.Error(err))
}
@ -277,26 +271,12 @@ func (n *layer) GetBucketSettings(ctx context.Context, bktInfo *data.BucketInfo)
}
func (n *layer) PutBucketSettings(ctx context.Context, p *PutSettingsParams) error {
rawSettings, err := json.Marshal(p.Settings)
if err != nil {
return fmt.Errorf("couldn't marshal bucket settings")
}
s := &PutSystemObjectParams{
BktInfo: p.BktInfo,
ObjName: p.BktInfo.SettingsObjectName(),
Metadata: map[string]string{},
Reader: bytes.NewReader(rawSettings),
Size: int64(len(rawSettings)),
}
_, err = n.putSystemObjectIntoNeoFS(ctx, s)
if err != nil {
return err
if err := n.treeService.PutSettingsNode(ctx, &p.BktInfo.CID, "version", p.Settings); err != nil {
return fmt.Errorf("failed to get settings node: %w", err)
}
systemKey := systemObjectKey(p.BktInfo, p.BktInfo.SettingsObjectName())
if err = n.systemCache.PutSettings(systemKey, p.Settings); err != nil {
if err := n.systemCache.PutSettings(systemKey, p.Settings); err != nil {
n.log.Error("couldn't cache system object", zap.Error(err))
}