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

replication: pass user tags while queueing (#18052)

Browse Source 
Continues from #18032 - otherwise replication will fail on tag based rules.
This commit is contained in:
Poorna 2023-09-19 03:18:28 -07:00 committed by GitHub
parent b8ebe54e53
commit b73699fad8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/bucket-replication-utils.go
View File

@ -31,6 +31,7 @@ import (
"github.com/minio/madmin-go/v3" "github.com/minio/madmin-go/v3"
"github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/bucket/replication"
"github.com/minio/minio/internal/crypto"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
) )
@ -539,6 +540,7 @@ func getHealReplicateObjectInfo(oi ObjectInfo, rcfg replicationConfig) Replicate
ActualSize: asz, ActualSize: asz,
Bucket: oi.Bucket, Bucket: oi.Bucket,
VersionID: oi.VersionID, VersionID: oi.VersionID,
ETag: oi.ETag,
ModTime: oi.ModTime, ModTime: oi.ModTime,
ReplicationStatus: oi.ReplicationStatus, ReplicationStatus: oi.ReplicationStatus,
ReplicationStatusInternal: oi.ReplicationStatusInternal, ReplicationStatusInternal: oi.ReplicationStatusInternal,
@ -553,6 +555,8 @@ func getHealReplicateObjectInfo(oi ObjectInfo, rcfg replicationConfig) Replicate
TargetStatuses: tgtStatuses, TargetStatuses: tgtStatuses,
TargetPurgeStatuses: purgeStatuses, TargetPurgeStatuses: purgeStatuses,
ReplicationTimestamp: tm, ReplicationTimestamp: tm,
SSEC: crypto.SSEC.IsEncrypted(oi.UserDefined),
UserTags: oi.UserTags,
} }
} }

3
cmd/bucket-replication.go
View File

@ -2274,6 +2274,7 @@ func scheduleReplication(ctx context.Context, oi ObjectInfo, o ObjectLayer, dsc
ActualSize: asz, ActualSize: asz,
Bucket: oi.Bucket, Bucket: oi.Bucket,
VersionID: oi.VersionID, VersionID: oi.VersionID,
ETag: oi.ETag,
ModTime: oi.ModTime, ModTime: oi.ModTime,
ReplicationStatus: oi.ReplicationStatus, ReplicationStatus: oi.ReplicationStatus,
ReplicationStatusInternal: oi.ReplicationStatusInternal, ReplicationStatusInternal: oi.ReplicationStatusInternal,
@ -2287,6 +2288,8 @@ func scheduleReplication(ctx context.Context, oi ObjectInfo, o ObjectLayer, dsc
TargetStatuses: tgtStatuses, TargetStatuses: tgtStatuses,
TargetPurgeStatuses: purgeStatuses, TargetPurgeStatuses: purgeStatuses,
ReplicationTimestamp: tm, ReplicationTimestamp: tm,
SSEC: crypto.SSEC.IsEncrypted(oi.UserDefined),
UserTags: oi.UserTags,
} }
if dsc.Synchronous() { if dsc.Synchronous() {

1
cmd/object-api-datatypes.go
View File

@ -311,6 +311,7 @@ type ReplicateObjectInfo struct {
Name string Name string
Bucket string Bucket string
VersionID string VersionID string
ETag string
Size int64 Size int64
ActualSize int64 ActualSize int64
ModTime time.Time ModTime time.Time