-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
attach: don't return context cancelled error #5295
Conversation
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]>
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 |
FWIW, I recall we also added a utility to errdefs, but not sure if we also must ignore the other context error for these
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
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)