opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11802 from flouthoc/podman-machine-rm-cleanup

Browse Source 
machine: silently cleanup dangling sockets before `rm` if possible
This commit is contained in:
OpenShift Merge Robot
2021-10-01 10:21:13 -04:00
committed by GitHub
parent fedd9cc120 642d682998
commit 324871d451
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/machine/qemu/machine.go
View File

@ -465,6 +465,22 @@ func (v *MachineVM) Remove(name string, opts machine.RemoveOptions) (string, fun
for _, msg := range files { for _, msg := range files {
confirmationMessage += msg + "\n" confirmationMessage += msg + "\n"
} }
// Get path to socket and pidFile before we do any cleanups
qemuSocketFile, pidFile, errSocketFile := v.getSocketandPid()
//silently try to delete socket and pid file
//remove socket and pid file if any: warn at low priority if things fail
if errSocketFile == nil {
// Remove the pidfile
if err := os.Remove(pidFile); err != nil && !errors.Is(err, os.ErrNotExist) {
logrus.Debugf("Error while removing pidfile: %v", err)
}
// Remove socket
if err := os.Remove(qemuSocketFile); err != nil && !errors.Is(err, os.ErrNotExist) {
logrus.Debugf("Error while removing podman-machine-socket: %v", err)
}
}
confirmationMessage += "\n" confirmationMessage += "\n"
return confirmationMessage, func() error { return confirmationMessage, func() error {
for _, f := range files { for _, f := range files {