Improve ConsoleCancellationManager with process termination timeout#17251
Merged
Conversation
Merge improvements from System.CommandLine ProcessTerminationHandler: - Add processTerminationTimeout (5s) for graceful shutdown after signals - Use PosixSignalRegistration for both SIGINT and SIGTERM - Add AppDomain.ProcessExit handler for fallback platforms - Wait for handler task completion within timeout before forced exit - Race handler task against ProcessTerminationCompletionSource via Task.WhenAny Fixes #17203 Fixes #17223
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates Aspire CLI process-termination handling to more closely match System.CommandLine’s ProcessTerminationHandler, aiming to cancel gracefully on termination signals and, after a timeout, force termination with a signal-appropriate exit code.
Changes:
- Adds a 5-second graceful shutdown timeout via
ConsoleCancellationManagerand a termination completion source. - Switches to using
PosixSignalRegistrationfor SIGINT and SIGTERM (with a fallback path on some platforms). - Updates
Program.Mainto race command execution against a termination completion task and disablesSystem.CommandLine’s process-termination timeout handling.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/Aspire.Cli/Program.cs | Uses the new cancellation manager timeout behavior and races handler completion vs. termination completion for exit behavior. |
| src/Aspire.Cli/ConsoleCancellationManager.cs | Implements SIGINT/SIGTERM handling plus a graceful shutdown wait and forced termination signaling. |
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 17251Or
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 17251" |
Member
Author
PR Testing ReportPR Information
CLI Version Verification
Changes AnalyzedFiles Changed
Change Categories
Test Scenarios ExecutedScenario 1: Basic CLI FunctionalityObjective: Verify CLI still works normally (no regressions) Steps:
Observations:
Scenario 2: Start and Graceful StopObjective: Verify Steps:
Observations:
Scenario 3: Ctrl+C / Signal Termination (Core PR behavior)Objective: Test SIGINT (Ctrl+C) triggers graceful shutdown within the 5-second timeout Steps:
Evidence:
Observations:
Summary
Overall Result✅ PR VERIFIED The
|
radical
reviewed
May 19, 2026
adamint
approved these changes
May 19, 2026
Contributor
|
❓ CLI E2E Tests unknown — 92 passed, 0 failed, 2 unknown (commit View all recordings
📹 Recordings uploaded automatically from CI run #26102544581 |
Contributor
|
✅ No documentation update needed. docs_optional → internal_refactor No signals triggered ( |
This was referenced May 19, 2026
Open
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
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.
Summary
Errors were caused by a race between System.Commandline built-in cancellaiton handling and Aspire CLIs. Disabled System.Commandline by removing its timeout, and moved timeout feature to our type.
Merges improvements from
System.CommandLine.ProcessTerminationHandlerintoConsoleCancellationManagerto provide a graceful shutdown timeout when the CLI receives termination signals.Changes
PosixSignalRegistration; now both signals use the preferred API uniformly (with fallback toConsole.CancelKeyPress+AppDomain.ProcessExiton unsupported platforms).ProcessTerminationCompletionSourceso the process exits promptly with the correct signal exit code (130 for SIGINT, 143 for SIGTERM) if the handler doesn't finish within the timeout.Fixes
Ctrl+Cto stop theaspire newwill meet 'An unexpected error occurred: A task was canceled ' #17203aspire agent initthrows an error during ctrl-c, isntead of exiting gracefully #17223