Check cancellation token at start of WaitAsync() #2507
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
roji
force-pushed
the
WaitAsyncCancelledToken
branch
from
eaf8c9d
to
64890bd
Compare
YohDeadfall
reviewed
Jun 27, 2019
| @@ -1228,6 +1228,9 @@ public bool Wait(int timeout) | |||
| [PublicAPI] | |||
| public Task WaitAsync(CancellationToken cancellationToken) | |||
| { | |||
| if (cancellationToken.IsCancellationRequested) | |||
| return PGUtil.CancelledTask; | |||
There was a problem hiding this comment.
Should Task.FromCanceled(cancellationToken) be used here?
There was a problem hiding this comment.
Unfortunately it doesn't exist in net45 which is targeted in Npgsql 4.0... The equivalent for dev is using Task.FromCanceled() (#2443).
Otherwise passing a cancelled token makes WaitAsync() crash. Note that a race condition still exists if the token is cancelled after our check but before WaitAsync starts its job. Fixes npgsql#2506
roji
force-pushed
the
WaitAsyncCancelledToken
branch
from
64890bd
to
9963fce
Compare
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.
Otherwise passing a cancelled token makes WaitAsync() crash.
Note that a race condition still exists if the token is cancelled after our check but before WaitAsync starts its job.
Fixes #2506
The fix for dev will be part of #2443