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

[#346] Upgrade NeoFS SDK Go library

Browse source 
Core changes:
  - `object.ID` moved to new package `oid`;
  - `object.Address` moved to new package `address`;
  - `pool.Object` interface changes.

Additionally:
  - Set container owner in `Agent.IssueSecret`.
  - Remove no longer needed fields from `GetObjectParams`
  - `Length` and `Offset` are never assigned. These values
  are set in `Range` field.
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-02-08 19:54:04 +03:00 • committed by LeL
parent 6a4fba4d09
commit 34a221c5c9
28 changed files with 430 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

27
api/layer/multipart_upload.go
View file

@ -260,12 +260,15 @@ func (n *layer) CompleteMultipartUpload(ctx context.Context, p *CompleteMultipar
uploadCompleted = true
done <- true
}(done)
var prmGet getParams
prmGet.w = pw
prmGet.cid = p.Info.Bkt.CID
for _, part := range parts {
_, err := n.objectGetWithPayloadWriter(ctx, &getParams{
Writer: pw,
cid: p.Info.Bkt.CID,
oid: part.ID,
})
prmGet.oid = part.ID
err = n.objectWritePayload(ctx, prmGet)
if err != nil {
_ = pw.Close()
n.log.Error("could not download a part of multipart upload",
@ -317,11 +320,11 @@ func (n *layer) ListMultipartUploads(ctx context.Context, p *ListMultipartUpload
uploads := make([]*UploadInfo, 0, len(ids))
uniqDirs := make(map[string]struct{})
for _, id := range ids {
meta, err := n.objectHead(ctx, p.Bkt.CID, id)
for i := range ids {
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[i])
if err != nil {
n.log.Warn("couldn't head object",
zap.Stringer("object id", id),
zap.Stringer("object id", &ids[i]),
zap.Stringer("bucket id", p.Bkt.CID),
zap.Error(err))
continue
@ -446,7 +449,7 @@ func (n *layer) GetUploadInitInfo(ctx context.Context, p *UploadInfoParams) (*da
return nil, errors.GetAPIError(errors.ErrInternalError)
}
meta, err := n.objectHead(ctx, p.Bkt.CID, ids[0])
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[0])
if err != nil {
return nil, err
}
@ -470,11 +473,11 @@ func (n *layer) getUploadParts(ctx context.Context, p *UploadInfoParams) (map[in
res := make(map[int]*data.ObjectInfo)
for _, id := range ids {
meta, err := n.objectHead(ctx, p.Bkt.CID, id)
for i := range ids {
meta, err := n.objectHead(ctx, p.Bkt.CID, &ids[i])
if err != nil {
n.log.Warn("couldn't head a part of upload",
zap.Stringer("object id", id),
zap.Stringer("object id", &ids[i]),
zap.Stringer("bucket id", p.Bkt.CID),
zap.Error(err))
continue