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

fix: duplicate delete marker attempts in bi-directional replication (#11491)

Browse Source
This commit is contained in:
Poorna Krishnamoorthy
2021-02-09 15:11:43 -08:00
committed by GitHub
parent fe3c39b583
commit 93eb549a83
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/erasure-object.go
View File

@@ -1034,11 +1034,10 @@ func (er erasureObjects) DeleteObject(ctx context.Context, bucket, object string
if goi.VersionID != "" {
markDelete = true
}
// Default deleteMarker to true if object is under versioning
deleteMarker := true
if gerr == nil {
deleteMarker = goi.VersionID != ""
}
deleteMarker := opts.Versioned
if opts.VersionID != "" {
// case where replica version needs to be deleted on target cluster
if versionFound && opts.DeleteMarkerReplicationStatus == replication.Replica.String() {
@@ -1047,7 +1046,7 @@ func (er erasureObjects) DeleteObject(ctx context.Context, bucket, object string
if opts.VersionPurgeStatus.Empty() && opts.DeleteMarkerReplicationStatus == "" {
markDelete = false
}
if opts.DeleteMarker && opts.VersionPurgeStatus == Complete {
if opts.VersionPurgeStatus == Complete {
markDelete = false
}
// determine if the version represents an object delete