Skip to content
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

Merged
merged 1 commit into from
Jan 18, 2022

Conversation

vrothberg
Copy link
Member

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

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]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 18, 2022

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2022
@rhatdan
Copy link
Member

rhatdan commented Jan 18, 2022

LGTM
@containers/podman-maintainers PTAL

@baude
Copy link
Member

baude commented Jan 18, 2022

excellent work @vrothberg

@baude
Copy link
Member

baude commented Jan 18, 2022

/hold
/lgtm

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2022
@@ -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)
Copy link
Member

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?

Copy link
Member Author

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.

@mheon
Copy link
Member

mheon commented Jan 18, 2022

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jan 18, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2022
@openshift-merge-robot openshift-merge-robot merged commit 62212db into containers:main Jan 18, 2022
@vrothberg vrothberg deleted the fix-12904 branch January 19, 2022 07:51
@vrothberg
Copy link
Member Author

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.

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

API server crashes with race condition in logging code
6 participants