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

Fix locking error in WSL machine rm -f #20841

Merged
merged 1 commit into from
Nov 30, 2023

Conversation

ashley-cui
Copy link
Member

@ashley-cui ashley-cui commented Nov 29, 2023

Fixed a bug where podman machine rm -f would cause a deadlock when running with WSL.

The deadlock is caused by the Remove() function calling the Stop() function after Remove() locks the VM. Stop() also has a lock call, which fails and deadlocks because Remove() already claimed lock. Fix this by moving the stop call before the lock

[NO NEW TESTS NEEDED]

Does this PR introduce a user-facing change?

Fixed a bug where `podman machine rm -f` would cause a deadlock when running with WSL.

@ashley-cui
Copy link
Member Author

/cherry-pick v4.8

Copy link
Contributor

openshift-ci bot commented Nov 29, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashley-cui

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 Nov 29, 2023
@openshift-cherrypick-robot
Copy link
Collaborator

@ashley-cui: once the present PR merges, I will cherry-pick it on top of v4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick v4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Fixed a bug where `podman machine rm -f` would cause a deadlock when
running with WSL.

The deadlock is caused by the Remove() function calling the Stop()
function after Remove() locks the VM. Stop() also has a lock call, which
fails and deadlocks because Remove() already claimed lock. Fix this by
moving the stop call before the lock

[NO NEW TESTS NEEDED]

Signed-off-by: Ashley Cui <[email protected]>
@baude
Copy link
Member

baude commented Nov 29, 2023

LGTM

@rhatdan
Copy link
Member

rhatdan commented Nov 30, 2023

/lgtm
/hold

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Nov 30, 2023
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.

/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 Nov 30, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit f2f7d60 into containers:main Nov 30, 2023
93 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@ashley-cui: new pull request created: #20849

In response to this:

/cherry-pick v4.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ashley-cui ashley-cui deleted the wsldeadlock branch January 8, 2024 20:49
@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 Apr 8, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 8, 2024
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. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants