attach: don't return context cancelled error #5295
Merged
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
In 3f0d90a we introduced a global signal handler and made sure all the contexts passed into command execution get (appropriately) cancelled when we get a SIGINT. Due to that change, and how we use this context during `docker attach`, we started to return the context cancelation error when a user signals the running `docker attach`. Since this is the intended behavior, we shouldn't return an error, so this commit adds checks to ignore this specific error in this case. Also adds a regression test. Signed-off-by: Laura Brehm <[email protected]>
laurazard
force-pushed
the
fix-context-cancel-attach
branch
from
53433e1 to
66aa0f6
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5295 +/- ##
==========================================
+ Coverage 60.99% 61.46% +0.46%
==========================================
Files 296 299 +3
Lines 20846 20856 +10
==========================================
+ Hits 12716 12820 +104
+ Misses 7212 7120 -92
+ Partials 918 916 -2 |
Member
|
FWIW, I recall we also added a utility to errdefs, but not sure if we also must ignore the other context error for these |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
closes #5294
- What I did
In #4993 we introduced a global signal handler and made sure all the contexts passed into command execution get (appropriately) cancelled when we get a
SIGINT.Due to how we use this context in
docker attach, this caused us to start returning a context cancelation error when a user signals the runningdocker attach.Since this is the intended behavior, we shouldn't return an error, so this commit adds checks to ignore this specific error in this case.
Also adds a regression test.
- How to verify it
Run the added test:
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)