Adding cancel execution command #1057
Conversation
colombod
force-pushed
the
cancel_execution_command
branch
3 times, most recently
from
76f33f9
to
2083ddf
Compare
| @@ -425,6 +426,189 @@ public async Task Deferred_commands_on_composite_kernel_are_execute_on_first_sub | |||
| typeof(CommandSucceeded)); | |||
| } | |||
|
|
|||
| [Fact] | |||
| public async Task quit_command_cancels_all_deferred_commands_on_composite_kernel() | |||
There was a problem hiding this comment.
These aren't really just tests of the CompositeKernel. It might be useful to split them into a new test class and move toward a more vertical test organization.
There was a problem hiding this comment.
moved to QuiCommandTests class
| { | ||
| await Task.Delay(100); | ||
| await kernel.SendAsync(cancelCommand); | ||
| })).Wait(); |
There was a problem hiding this comment.
Make sure to enforce a timeout here.
| [Theory] | ||
| [InlineData(Language.CSharp)] | ||
| [InlineData(Language.FSharp)] | ||
| public async Task cancel_command_cancels_all_deferred_commands(Language language) |
There was a problem hiding this comment.
This looks like a duplicate. Consolidating will help make it clearer what we're testing.
| { | ||
| public Cancel(string targetKernelName = null): base(targetKernelName) | ||
| { | ||
| Handler = (command, context) => Task.CompletedTask; |
There was a problem hiding this comment.
It's preferable to override InvokeAsync. We should at some point limit the settable Handler property to only those commands that vary behavior by kernel.
| ClearPendingCommands(); | ||
| kernel.CancelInflightCommands(); | ||
| kernel.ClearPendingCommands(); | ||
| break; |
There was a problem hiding this comment.
Do these two cases need to vary in terms of behavior?
| case Cancel _: | ||
|
|
||
| CancelInflightCommands(); | ||
| ClearPendingCommands(); |
There was a problem hiding this comment.
Is "pending" different from "deferred"?
There was a problem hiding this comment.
pending includes all things in the trampoline queue and the deferred
There was a problem hiding this comment.
So it might be clearer to say ClearQueuedAndDeferredCommand since both of those are terms that already exist in the code.
| @@ -213,6 +213,22 @@ protected override void SetHandlingKernel(KernelCommand command, KernelInvocatio | |||
| throw new NoSuitableKernelException(command); | |||
| } | |||
|
|
|||
| switch (command) | |||
There was a problem hiding this comment.
Rather than duplicating all of this, why not move it to the base and put the actual cancellation logic into a virtual method?
| { | ||
| private static readonly CompositeDisposable DisposeOnQuit = new(); | ||
|
|
||
| public static void RegisterForDisposalOnQuit(IDisposable disposable) |
There was a problem hiding this comment.
Why have potentially different disposal semantics than Kernel.Dispose? This looks like something that doesn't belong in the library. It should probably just be a host concern.
There was a problem hiding this comment.
we can have the host to register the OnQuit handler, and throw if it is not set
|
|
||
| public Quit(Action onQuit, string targetKernelName = null) : base(targetKernelName) | ||
| { | ||
| if (onQuit == null) |
There was a problem hiding this comment.
| if (onQuit == null) | |
| if (onQuit is null) |
| _events.OnCompleted(); | ||
| IsComplete = true; | ||
| _events.OnCompleted(); | ||
| _cancellationTokenSource.Cancel(false); |
There was a problem hiding this comment.
It looks like this gets called twice when someone is calling Cancel.
colombod
force-pushed
the
cancel_execution_command
branch
5 times, most recently
from
8a2ce09
to
fba0b52
Compare
|
|
||
| namespace Microsoft.DotNet.Interactive.Tests | ||
| { | ||
| [Collection("Do not parallelize")] |
There was a problem hiding this comment.
Why should these not be parallelizable? That sounds like a smell.
colombod
force-pushed
the
cancel_execution_command
branch
7 times, most recently
from
5289339
to
e3aa6bd
Compare
remove unused methods
deferred command that match the kernel used during scheduling of a command are executed deferred command order is preserved and parent kernel deferred commands are executed when scheduling commands on child kernel do not produce diagnostic events when there are none use callable command
colombod
force-pushed
the
cancel_execution_command
branch
from
ab93a75
to
314e740
Compare
colombod
force-pushed
the
cancel_execution_command
branch
from
d05b3d6
to
88cc568
Compare
Add tests for quit command