Fix CancelledError retry loops to enable immediate S3 upload cancellation #9711
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
ashovlin
reviewed
Sep 25, 2025
Added in commit 0620fde |
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.
Copy from Botocore: boto/botocore#3552
This fix ensures that Ctrl-C and other cancellation signals immediately stop S3 uploads by preventing CancelledError retry loops in the HTTP session, allowing users to terminate operations promptly instead of waiting through lengthy retry cycles. Adding a specific exception handler for CancelledError in httpsession.py that re-raises the error unchanged before it reaches the generic handler. This prevents the cancellation signal from being misclassified as a retryable HTTP error.