Skip to content

[s3] fix metadata lost during backup and restore #1967 #14

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

Open
gcpcscol wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[s3] fix metadata lost during backup and restore #1967 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2132d2b
[s3] fix metadata lost during backup and restore #1967
May 29, 2026
9282b0c
[s3] improve performance to fetch metadata
Jun 24, 2026
3110b5c
Merge branch 'PlakarKorp:main' into fix/s3-metadata
gcpcscol Jun 24, 2026
794a63a
[s3] error handling when retrieving the object
Jun 24, 2026
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
16 changes: 15 additions & 1 deletion s3/exporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package exporter
import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"net/url"
"path"
Expand Down Expand Up @@ -241,8 +242,21 @@ func (p *S3Exporter) Export(ctx context.Context, records <-chan *connectors.Reco

g.Go(func() error {
objname := strings.TrimLeft(path.Join(p.restoreDir, record.Pathname), "/")
var objectInfo minio.ObjectInfo
if len(record.ExtendedAttributes) > 0 {
if err := json.Unmarshal([]byte(record.ExtendedAttributes[0]), &objectInfo); err != nil {
objectInfo.UserTags = nil
objectInfo.UserMetadata = nil
}
}

_, err := p.minioClient.PutObject(ctx, p.bucket, objname,
record.Reader, record.FileInfo.Lsize, minio.PutObjectOptions{ServerSideEncryption: p.ssec})
record.Reader, record.FileInfo.Lsize, minio.PutObjectOptions{
ServerSideEncryption: p.ssec,
ContentType: objectInfo.ContentType,
UserTags: objectInfo.UserTags,
UserMetadata: objectInfo.UserMetadata,
})
results <- record.Error(err)
return nil
})
Expand Down
16 changes: 14 additions & 2 deletions s3/importer/importer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package importer
import (
"context"
"encoding/base64"
"encoding/json"
"fmt"
"io"
"net/url"
Expand Down Expand Up @@ -245,8 +246,19 @@ func (p *S3Importer) Import(ctx context.Context, records chan<- *connectors.Reco
Ldev: 1,
}

records <- connectors.NewRecord("/"+object.Key, "", fi, nil, func() (io.ReadCloser, error) {
return p.minioClient.GetObject(ctx, p.bucket, object.Key, minio.GetObjectOptions{ServerSideEncryption: p.ssec})
var xattr []string
obj, err := p.minioClient.GetObject(ctx, p.bucket, object.Key, minio.GetObjectOptions{ServerSideEncryption: p.ssec})
if err == nil {
if stat, err := obj.Stat(); err == nil {
xattrStr, err := json.Marshal(stat)
if err == nil {
xattr = append(xattr, string(xattrStr))
}
}
}

records <- connectors.NewRecord("/"+object.Key, "", fi, xattr, func() (io.ReadCloser, error) {
return obj, err
})
}

Expand Down