astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-23 14:10:25 +03: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
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/namespace-lock.go
+2 -2
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
} }