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

container stats: fix --no-stream race #6406

Merged
merged 1 commit into from
May 27, 2020

Conversation

vrothberg
Copy link
Member

Fix a race in podman container stats by waiting for the client to
consume the data in the channel. This requires a sync.WaitGroup (or
semaphore) in the client and to also close the channel the backend.

Fixes: #6405
Signed-off-by: Valentin Rothberg [email protected]

@baude PTAL

Fix a race in `podman container stats` by waiting for the client to
consume the data in the channel.  This requires a `sync.WaitGroup` (or
semaphore) in the client and to also close the channel the backend.

Fixes: containers#6405
Signed-off-by: Valentin Rothberg <[email protected]>
@openshift-ci-robot
Copy link
Collaborator

[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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 27, 2020
@vrothberg
Copy link
Member Author

Somehow related: I find the pod stats implementation slightly less complicated as all the streaming logic is part of cmd/podman while the API always returns the stats of one call. This also allows for separating CLI and API options (see https://github.com/containers/libpod/blob/master/cmd/podman/pods/stats.go#L24).

@vrothberg vrothberg mentioned this pull request May 27, 2020
@baude
Copy link
Member

baude commented May 27, 2020

LGTM

@mheon
Copy link
Member

mheon commented May 27, 2020

Nice catch!
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 27, 2020
@openshift-merge-robot openshift-merge-robot merged commit 9cb5c87 into containers:master May 27, 2020
@vrothberg vrothberg deleted the stats-race branch May 27, 2020 14:20
@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 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 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.

[CI flake] podman stats --format json - no output
5 participants