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.

Sign up for GitHub

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

Jump to bottom

logs -f: file: fix dead lock #11464

Merged
merged 1 commit into from
Sep 7, 2021
Merged

logs -f: file: fix dead lock #11464

merged 1 commit into from
Sep 7, 2021

Conversation

vrothberg
Copy link
Member

Fix a dead lock in the file log driver where one goroutine would wait on
the tail to hit EOF but reading is blocked for the function to return.

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 7, 2021

[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 Sep 7, 2021
Luap99
Luap99 reviewed Sep 7, 2021
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will leak the new goroutine since the deadlock problem is not solved. It just deadlocks in the goroutine now.

libpod/container_log.go Outdated Show resolved Hide resolved
@vrothberg
Copy link
Member Author

I think this will leak the new goroutine since the deadlock problem is not solved. It just deadlocks in the goroutine now.

Interesting. I'll dig a bit deeper, cheers!

@vrothberg
Copy link
Member Author

I think this will leak the new goroutine since the deadlock problem is not solved. It just deadlocks in the goroutine now.

Nope. It doesn't deadlock there. For a moment, you made me doubt.

@vrothberg
Copy link
Member Author

@containers/podman-maintainers PTAL

@vrothberg
logs -f: file: fix dead lock
1eaa449 
Fix a dead lock in the file log driver where one goroutine would wait on
the tail to hit EOF but reading is blocked for the function to return.

Fixes: 11461
Signed-off-by: Valentin Rothberg <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Sep 7, 2021

LGTM

@Luap99
Copy link
Member

Luap99 commented Sep 7, 2021

I think this will leak the new goroutine since the deadlock problem is not solved. It just deadlocks in the goroutine now.

Nope. It doesn't deadlock there. For a moment, you made me doubt.

OK, thanks for checking.
LGTM

@Luap99
Copy link
Member

Luap99 commented Sep 7, 2021

/lgtm
/hold

@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 Sep 7, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2021
@vrothberg
Copy link
Member Author

/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 Sep 7, 2021
@openshift-merge-robot openshift-merge-robot merged commit c20227b into containers:main Sep 7, 2021
@vrothberg vrothberg mentioned this pull request Sep 7, 2021
Closed
@vrothberg vrothberg deleted the fix-11461 branch September 7, 2021 14:51
@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 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Luap99 Luap99 Luap99 left review comments

Assignees

@Luap99 Luap99

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vrothberg @rhatdan @Luap99 @openshift-merge-robot