MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-14 08:15:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: support prefix when batchJob replicate enable the snowball (#20178)

Browse Source
This commit is contained in:
jiuker 2024-07-29 15:59:50 +08:00 committed by GitHub
parent a60267501d
commit c87a489514
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/batch-handlers.go
View File

@ -540,7 +540,7 @@ func toObjectInfo(bucket, object string, objInfo miniogo.ObjectInfo) ObjectInfo
return oi return oi
} }
func (r BatchJobReplicateV1) writeAsArchive(ctx context.Context, objAPI ObjectLayer, remoteClnt *minio.Client, entries []ObjectInfo) error { func (r BatchJobReplicateV1) writeAsArchive(ctx context.Context, objAPI ObjectLayer, remoteClnt *minio.Client, entries []ObjectInfo, prefix string) error {
input := make(chan minio.SnowballObject, 1) input := make(chan minio.SnowballObject, 1)
opts := minio.SnowballOptions{ opts := minio.SnowballOptions{
Opts: minio.PutObjectOptions{}, Opts: minio.PutObjectOptions{},
@ -562,6 +562,10 @@ func (r BatchJobReplicateV1) writeAsArchive(ctx context.Context, objAPI ObjectLa
continue continue
} }
if prefix != "" {
entry.Name = pathJoin(prefix, entry.Name)
}
snowballObj := minio.SnowballObject{ snowballObj := minio.SnowballObject{
// Create path to store objects within the bucket. // Create path to store objects within the bucket.
Key: entry.Name, Key: entry.Name,
@ -1135,7 +1139,7 @@ func (r *BatchJobReplicateV1) Start(ctx context.Context, api ObjectLayer, job Ba
batch := make([]ObjectInfo, 0, *r.Source.Snowball.Batch) batch := make([]ObjectInfo, 0, *r.Source.Snowball.Batch)
writeFn := func(batch []ObjectInfo) { writeFn := func(batch []ObjectInfo) {
if len(batch) > 0 { if len(batch) > 0 {
if err := r.writeAsArchive(ctx, api, cl, batch); err != nil { if err := r.writeAsArchive(ctx, api, cl, batch, r.Target.Prefix); err != nil {
batchLogOnceIf(ctx, err, job.ID+"writeAsArchive") batchLogOnceIf(ctx, err, job.ID+"writeAsArchive")
for _, b := range batch { for _, b := range batch {
slowCh <- itemOrErr[ObjectInfo]{Item: b} slowCh <- itemOrErr[ObjectInfo]{Item: b}