Fix some issues with Ignitor #15276
Merged
Fix some issues with Ignitor #15276
Conversation
This file contains hidden or 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
Contributor
pranavkm
commented
Oct 22, 2019
pranavkm
commented
- Avoid null ref when FormatException is not set
- Handle errors when the client is canceled but an operation is in progress
* Avoid null ref when FormatException is not set * Handle errors when the client is canceled but an operation is in progress
pranavkm
commented
Oct 22, 2019
| namespace Ignitor | ||
| { | ||
| internal class CancellableOperation<TResult> | ||
| { | ||
| public CancellableOperation(TimeSpan? timeout) | ||
| public CancellableOperation(TimeSpan? timeout, CancellationToken cancellationToken) |
There was a problem hiding this comment.
The bulk of the interesting changes are localized to this type. Here's what happens:
- We start a
PrepareForNextBatch - In the meanwhile,
BlazorClient.Cancelis invoked (the server may or may not be dead at this point) CancellableOperationknows nothing about this and eventually times out.
This change associates the BlazorClient.Cancel with the operation and no-ops if the client has been cancelled
pranavkm
commented
Oct 22, 2019
| @@ -233,7 +236,7 @@ private async Task<CapturedRenderBatch> WaitForRenderBatch(TimeSpan? timeout = n | |||
| { | |||
| return await PrepareForNextBatch(timeout ?? DefaultOperationTimeout); | |||
| } | |||
| catch (OperationCanceledException) | |||
| catch (TimeoutException) when (FormatError != null) | |||
There was a problem hiding this comment.
This was a pain to discover: FomatError isn't set up in the benchmarks repo. Took me forever to figure out was causing a null ref.
There was a problem hiding this comment.
@pranavkm What is format error?
There was a problem hiding this comment.
It's a callback used in the test to pretty print the exception + log: https://github.com/aspnet/AspNetCore/blob/master/src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs#L59-L63.
NTaylorMullen
approved these changes
Oct 23, 2019
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.