erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-02 05:37:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #20841 from ashley-cui/wsldeadlock

Browse source 
Fix locking error in WSL machine rm -f
This commit is contained in:
openshift-merge-bot[bot] 2023-11-30 14:00:35 +00:00 • committed by GitHub
commit f2f7d60741
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/machine/wsl/machine.go
View file

@ -1591,9 +1591,6 @@ func readWinProxyTid(v *MachineVM) (uint32, uint32, string, error) {
func (v *MachineVM) Remove(name string, opts machine.RemoveOptions) (string, func() error, error) {
var files []string
v.lock.Lock()
defer v.lock.Unlock()
if v.isRunning() {
if !opts.Force {
return "", nil, &machine.ErrVMRunningCannotDestroyed{Name: v.Name}
@ -1603,6 +1600,9 @@ func (v *MachineVM) Remove(name string, opts machine.RemoveOptions) (string, fun
}
}
v.lock.Lock()
defer v.lock.Unlock()
// Collect all the files that need to be destroyed
if !opts.SaveKeys {
files = append(files, v.IdentityPath, v.IdentityPath+".pub")