Fix lock and semaphore timeouts #64
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| }; | ||
|
|
||
| var attempts = 0; | ||
| var start = DateTime.UtcNow; |
There was a problem hiding this comment.
DateTime arithmetic is not a good way of calculating elapsed time, StopWatch is more accurate.
jgiannuzzi
reviewed
Jan 22, 2021
There was a problem hiding this comment.
Great catch, @marcin-krystianc!
I just have one tiny nitpick below, but otherwise it LGTM 👍
Consul/Lock.cs
Outdated
| @@ -251,23 +252,24 @@ public async Task<CancellationToken> Acquire(CancellationToken ct) | |||
|
|
|||
| var qOpts = new QueryOptions() | |||
| { | |||
| WaitTime = Opts.LockWaitTime | |||
| WaitTime = Opts.LockWaitTime, | |||
There was a problem hiding this comment.
Please remove the comma at the end for style consistency with the rest of the project
|
A more in depth explanation of @marcin-krystianc's fix can be found in the original PR for Consul. |
…marcink-20210121-lock-fix
jgiannuzzi
reviewed
Jan 22, 2021
Consul/Lock.cs
Outdated
| { | ||
| DisposeCancellationTokenSource(); | ||
| throw new LockMaxAttemptsReachedException("LockTryOnce is set and the lock is already held or lock delay is in effect"); | ||
| } | ||
| qOpts.WaitTime -= elapsed; | ||
|
|
There was a problem hiding this comment.
Can you remove the extra line?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The logic for calculating the
WaitTimewas broken.I think that this bug was inherited from go library. It is fixed there already (hashicorp/consul@9043966)