From ae71d7690106b9c77913f58a4a307e9b2caa2c16 Mon Sep 17 00:00:00 2001 From: M Alvee Date: Mon, 8 Sep 2025 10:43:13 -0700 Subject: [PATCH] fix: remove unnecessary replication checks (#21569) --- cmd/erasure-multipart.go | 8 ++++---- cmd/erasure-object.go | 4 ++-- cmd/object-api-options.go | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cmd/erasure-multipart.go b/cmd/erasure-multipart.go index f748f1f3e..2d85e9dc0 100644 --- a/cmd/erasure-multipart.go +++ b/cmd/erasure-multipart.go @@ -394,9 +394,9 @@ func (er erasureObjects) newMultipartUpload(ctx context.Context, bucket string, return nil, err } - // if object doesn't exist and not a replication request return error for If-Match conditional requests + // if object doesn't exist return error for If-Match conditional requests // If-None-Match should be allowed to proceed for non-existent objects - if err != nil && !opts.ReplicationRequest && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { + if err != nil && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { return nil, err } } @@ -1118,9 +1118,9 @@ func (er erasureObjects) CompleteMultipartUpload(ctx context.Context, bucket str return ObjectInfo{}, err } - // if object doesn't exist and not a replication request return error for If-Match conditional requests + // if object doesn't exist return error for If-Match conditional requests // If-None-Match should be allowed to proceed for non-existent objects - if err != nil && !opts.ReplicationRequest && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { + if err != nil && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { return ObjectInfo{}, err } } diff --git a/cmd/erasure-object.go b/cmd/erasure-object.go index 26ca3022b..33fd3dc13 100644 --- a/cmd/erasure-object.go +++ b/cmd/erasure-object.go @@ -1278,9 +1278,9 @@ func (er erasureObjects) putObject(ctx context.Context, bucket string, object st return objInfo, err } - // if object doesn't exist and not a replication request return error for If-Match conditional requests + // if object doesn't exist return error for If-Match conditional requests // If-None-Match should be allowed to proceed for non-existent objects - if err != nil && !opts.ReplicationRequest && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { + if err != nil && opts.HasIfMatch && (isErrObjectNotFound(err) || isErrVersionNotFound(err)) { return objInfo, err } } diff --git a/cmd/object-api-options.go b/cmd/object-api-options.go index 3da831df7..72396a776 100644 --- a/cmd/object-api-options.go +++ b/cmd/object-api-options.go @@ -420,9 +420,6 @@ func putOptsFromHeaders(ctx context.Context, hdr http.Header, metadata map[strin MTime: mtime, PreserveETag: etag, } - if _, ok := hdr[xhttp.MinIOSourceReplicationRequest]; ok { - op.ReplicationRequest = true - } return op, nil } // default case of passing encryption headers and UserDefined metadata to backend