Fix locking error in WSL machine rm -f

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]>
openshift-cherrypick-robot · Nov 30, 2023 · a72c39a · a72c39a
1 parent 78fdb40
commit a72c39a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
@@ -1594,9 +1594,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}
@@ -1606,6 +1603,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")