-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
compat attach: fix write on closed channel #12909
Conversation
Waiting on an initialized sync.WaitGroup returns immediately. Hence, move the goroutine to wait and close *after* reading the logs. Fixes: containers#12904 Signed-off-by: Valentin Rothberg <[email protected]>
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
LGTM |
excellent work @vrothberg |
/hold |
@@ -130,7 +130,7 @@ def test_resize(self): | |||
|
|||
def test_attach(self): | |||
self.skipTest("FIXME: Test timeouts") | |||
r = requests.post(self.uri(self.resolve_container("/containers/{}/attach")), timeout=5) | |||
r = requests.post(self.uri(self.resolve_container("/containers/{}/attach?logs=true")), timeout=5) |
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.
The test is skipped, can we remove the skip now?
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.
How could I not see the skip? Thanks for catching, I'll give it a shot.
LGTM |
/hold cancel |
There was still an open comment (see #12909 (comment)). I'll open a follow-up PR. I had a look yesterday but it turns out to be an origami-bug: slowly unfolding into something bigger. |
Waiting on an initialized sync.WaitGroup returns immediately.
Hence, move the goroutine to wait and close after reading
the logs.
Fixes: #12904
Signed-off-by: Valentin Rothberg [email protected]
@mheon PTAL