self-hosted/minio
self-hosted/minio
1
0
Fork 0
mirror of https://github.com/minio/minio synced 2024-10-14 11:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: a cosmetic error reporting with a lock timeout (#16788)

Browse source
This commit is contained in:
Anis Elleuch 2023-03-10 00:16:13 +01:00 committed by GitHub
parent a547bf517d
commit 5c087bdcad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/namespace-lock.go
View file

@ -170,7 +170,7 @@ func (di *distLockInstance) GetLock(ctx context.Context, timeout *dynamicTimeout
RetryInterval: timeout.RetryInterval(), RetryInterval: timeout.RetryInterval(),
}) { }) {
timeout.LogFailure() timeout.LogFailure()
cancel() defer cancel()
if err := newCtx.Err(); err == context.Canceled { if err := newCtx.Err(); err == context.Canceled {
return LockContext{ctx: ctx, cancel: func() {}}, err return LockContext{ctx: ctx, cancel: func() {}}, err
} }
@ -199,7 +199,7 @@ func (di *distLockInstance) GetRLock(ctx context.Context, timeout *dynamicTimeou
RetryInterval: timeout.RetryInterval(), RetryInterval: timeout.RetryInterval(),
}) { }) {
timeout.LogFailure() timeout.LogFailure()
cancel() defer cancel()
if err := newCtx.Err(); err == context.Canceled { if err := newCtx.Err(); err == context.Canceled {
return LockContext{ctx: ctx, cancel: func() {}}, err return LockContext{ctx: ctx, cancel: func() {}}, err
} }