root
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Avoid shadowing error during replication proxy check (#14655) 

Fixes #14652
This commit is contained in:
Poorna 2022-03-29 10:53:09 -07:00 committed by GitHub
parent 9e25475475
commit 4d13ddf6b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/object-handlers.go
View File

@ -416,16 +416,17 @@ func (api objectAPIHandlers) getObjectHandler(ctx context.Context, objectAPI Obj
var ( var (
reader *GetObjectReader reader *GetObjectReader
proxy proxyResult proxy proxyResult
perr error
) )
proxytgts := getproxyTargets(ctx, bucket, object, opts) proxytgts := getproxyTargets(ctx, bucket, object, opts)
if !proxytgts.Empty() { if !proxytgts.Empty() {
// proxy to replication target if active-active replication is in place. // proxy to replication target if active-active replication is in place.
reader, proxy, err = proxyGetToReplicationTarget(ctx, bucket, object, rs, r.Header, opts, proxytgts) reader, proxy, perr = proxyGetToReplicationTarget(ctx, bucket, object, rs, r.Header, opts, proxytgts)
if err != nil && !isErrObjectNotFound(ErrorRespToObjectError(err, bucket, object)) && if perr != nil && !isErrObjectNotFound(ErrorRespToObjectError(perr, bucket, object)) &&
!isErrVersionNotFound(ErrorRespToObjectError(err, bucket, object)) { !isErrVersionNotFound(ErrorRespToObjectError(perr, bucket, object)) {
logger.LogIf(ctx, fmt.Errorf("Replication proxy failed for %s/%s(%s) - %w", bucket, object, opts.VersionID, err)) logger.LogIf(ctx, fmt.Errorf("Replication proxy failed for %s/%s(%s) - %w", bucket, object, opts.VersionID, perr))
} }
if reader != nil && proxy.Proxy && err == nil { if reader != nil && proxy.Proxy && perr == nil {
gr = reader gr = reader
} }
} }