Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

layer: Fix multipart versioning #1067

Merged
merged 1 commit into from
Jan 31, 2025
Merged

layer: Fix multipart versioning #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/layer/multipart_upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,12 @@ func (n *layer) CompleteMultipartUpload(ctx context.Context, p *CompleteMultipar
CopiesNumber: multipartInfo.CopiesNumber,
}

header, err := n.prepareMultipartHeadObject(ctx, prmHeaderObject, multipartHash, homoHash, uint64(multipartObjetSize))
bktSettings, err := n.GetBucketSettings(ctx, p.Info.Bkt)
if err != nil {
return nil, nil, fmt.Errorf("couldn't get versioning settings object: %w", err)
}

header, err := n.prepareMultipartHeadObject(ctx, prmHeaderObject, multipartHash, homoHash, uint64(multipartObjetSize), bktSettings.VersioningEnabled())
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -1008,11 +1013,6 @@ func (n *layer) CompleteMultipartUpload(ctx context.Context, p *CompleteMultipar
return nil, nil, err
}

bktSettings, err := n.GetBucketSettings(ctx, p.Info.Bkt)
if err != nil {
return nil, nil, fmt.Errorf("couldn't get versioning settings object: %w", err)
}

headerObjectID, _ := header.ID()

// the "big object" is not presented in system, but we have to put correct info about it and its version.
Expand Down
6 changes: 5 additions & 1 deletion api/layer/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func (n *layer) PutObject(ctx context.Context, p *PutObjectParams) (*data.Extend
return extendedObjInfo, nil
}

func (n *layer) prepareMultipartHeadObject(ctx context.Context, p *PutObjectParams, payloadHash hash.Hash, homoHash hash.Hash, payloadLength uint64) (*object.Object, error) {
func (n *layer) prepareMultipartHeadObject(ctx context.Context, p *PutObjectParams, payloadHash hash.Hash, homoHash hash.Hash, payloadLength uint64, versioningEnabled bool) (*object.Object, error) {
var (
err error
owner = n.Owner(ctx)
Expand Down Expand Up @@ -368,6 +368,10 @@ func (n *layer) prepareMultipartHeadObject(ctx context.Context, p *PutObjectPara
attributes = append(attributes, *object.NewAttribute(object.AttributeFilePath, p.Object))
}

if versioningEnabled {
attributes = append(attributes, *object.NewAttribute(attrS3VersioningState, data.VersioningEnabled))
}

headerObject.SetAttributes(attributes...)

multipartHeader, err := n.neoFS.FinalizeObjectWithPayloadChecksums(ctx, headerObject, payloadHash, homoHash, payloadLength)
Expand Down
Loading