status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-16 15:47:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix lock and semaphore timeouts

Browse Source
This commit is contained in:
Hamish 2018-07-06 10:55:25 +01:00
parent 28ffc75f64
commit 9043966efd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/lock.go
View File

@ -181,11 +181,12 @@ WAIT:
// Handle the one-shot mode. // Handle the one-shot mode.
if l.opts.LockTryOnce && attempts > 0 { if l.opts.LockTryOnce && attempts > 0 {
elapsed := time.Since(start) elapsed := time.Since(start)
if elapsed > qOpts.WaitTime { if elapsed > l.opts.LockWaitTime {
return nil, nil return nil, nil
} }
qOpts.WaitTime -= elapsed // Query wait time should not exceed the lock wait time
qOpts.WaitTime = l.opts.LockWaitTime - elapsed
} }
attempts++ attempts++

5
api/semaphore.go
View File

@ -199,11 +199,12 @@ WAIT:
// Handle the one-shot mode. // Handle the one-shot mode.
if s.opts.SemaphoreTryOnce && attempts > 0 { if s.opts.SemaphoreTryOnce && attempts > 0 {
elapsed := time.Since(start) elapsed := time.Since(start)
if elapsed > qOpts.WaitTime { if elapsed > s.opts.SemaphoreWaitTime {
return nil, nil return nil, nil
} }
qOpts.WaitTime -= elapsed // Query wait time should not exceed the semaphore wait time
qOpts.WaitTime = s.opts.SemaphoreWaitTime - elapsed
} }
attempts++ attempts++