opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 18:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23526 from baude/windowsgvisorpidnoterror

Browse Source 
Ignore ERROR_SHARING_VIOLATION error on windows
This commit is contained in:
openshift-merge-bot[bot]
2024-08-06 22:21:57 +00:00
committed by GitHub
parent 4a9942a043 81003f2d08
commit 64020cdc51
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/machine/gvproxy.go
View File

@ -27,5 +27,5 @@ func CleanupGVProxy(f define.VMFile) error {
if err := waitOnProcess(proxyPid); err != nil {
return err
}
return f.Delete()
return removeGVProxyPIDFile(f)
}

7
pkg/machine/gvproxy_unix.go
View File

@ -8,6 +8,7 @@ import (
"syscall"
"time"
"github.com/containers/podman/v5/pkg/machine/define"
psutil "github.com/shirou/gopsutil/v3/process"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
@ -72,3 +73,9 @@ func waitOnProcess(processID int) error {
}
return backoffForProcess(p)
}
// removeGVProxyPIDFile is just a wrapper to vmfile delete so we handle differently
// on windows
func removeGVProxyPIDFile(f define.VMFile) error {
return f.Delete()
}

13
pkg/machine/gvproxy_windows.go
View File

@ -1,11 +1,14 @@
package machine
import (
"errors"
"os"
"time"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/winquit/pkg/winquit"
"github.com/sirupsen/logrus"
"golang.org/x/sys/windows"
)
func waitOnProcess(processID int) error {
@ -44,3 +47,13 @@ func waitOnProcess(processID int) error {
return nil
}
// removeGVProxyPIDFile special wrapper for deleting the GVProxyPIDFile on windows in case
// the file has an open handle which we will ignore. unix does not have this problem
func removeGVProxyPIDFile(f define.VMFile) error {
err := f.Delete()
if err != nil && !errors.Is(err, windows.ERROR_SHARING_VIOLATION) {
return err
}
return nil
}