Fix early SIGINT not preventing subsequent operation execution #1
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
- Create cancellation context at initialization time in NewContext instead of in acquireRun - Check if context is already cancelled in acquireRun and abort early if so - Simplify Stop() to always cancel the context - Add tests demonstrating the fix works correctly Co-authored-by: orgads <[email protected]>
Copilot
AI
changed the title
[WIP] Fix issue 31371 in Terraform repository
Fix early SIGINT not preventing subsequent operation execution
Nov 20, 2025
Copilot finished work on behalf of
orgads
November 20, 2025 07:20
Owner
|
This doesn't fix the issue. See hashicorp#37921 for a fix that works as expected. |
Changelog WarningCurrently this PR would target a v1.15 release. Please add a changelog entry for in the .changes/v1.15 folder, or discuss which release you'd like to target with your reviewer. If you believe this change does not need a changelog entry, please add the 'no-changelog-needed' label. |
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.
Fixes hashicorp#31371
Description
When
Stop()is called before a Terraform Core operation starts (e.g., SIGINT during the 3-4 second window before state lock acquisition), the operation proceeds anyway. This is a race condition:Stop()checks for an activerunContextCancel, finds none, and does nothing. When the operation subsequently callsacquireRun(), it creates a fresh context unaware of the cancellation.Changes
Core fix: Create cancellation context at
Contextinitialization rather than per-operation.NewContext(): InitializerunContextandrunContextCancelat construction timeStop(): Always cancel the context (removed nil check that allowed race)acquireRun(): Check if context already cancelled; abort operation immediately if soreleaseRun(): Remove context lifecycle management (context persists forContextlifetime)TestContext2Plan_stopBeforeStartandTestContext2Apply_stopBeforeStartdemonstrating fixTarget Release
1.15.x
Rollback Plan
Changes to Security Controls
No changes to security controls.
CHANGELOG entry
Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.