mirror of
https://github.com/containers/podman.git
synced 2025-11-04 00:50:15 +08:00
487219d809
Also addresses a number of issues: - StopHostNetworking isn't plumbed, win-sshproxy leaks on hyperv - Wait api and print output doesn't work properly on Windows - API forwarding doesn't work on WSL - Terminal corruption with after start/stop on Windows - Gvproxy is forcefully killed vs gracefully quit - Switching rootful/rootless does not update /var/run/docker.sock on the guest - File already closed error on init - HyperV backend is publishing Unix sockets when it should be named pipes - User-mode networking doesn't always work - Stop state outside of lock boundaries - WSL blocks parallel machined (should be supported) [NO NEW TESTS NEEDED] Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
42 lines
1.0 KiB
Go
42 lines
1.0 KiB
Go
//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
|
|
|
|
package machine
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"syscall"
|
|
|
|
psutil "github.com/shirou/gopsutil/v3/process"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// / waitOnProcess takes a pid and sends a sigterm to it. it then waits for the
|
|
// process to not exist. if the sigterm does not end the process after an interval,
|
|
// then sigkill is sent. it also waits for the process to exit after the sigkill too.
|
|
func waitOnProcess(processID int) error {
|
|
logrus.Infof("Going to stop gvproxy (PID %d)", processID)
|
|
|
|
p, err := psutil.NewProcess(int32(processID))
|
|
if err != nil {
|
|
return fmt.Errorf("looking up PID %d: %w", processID, err)
|
|
}
|
|
|
|
running, err := p.IsRunning()
|
|
if err != nil {
|
|
return fmt.Errorf("checking if gvproxy is running: %w", err)
|
|
}
|
|
if !running {
|
|
return nil
|
|
}
|
|
|
|
if err := p.Kill(); err != nil {
|
|
if errors.Is(err, syscall.ESRCH) {
|
|
logrus.Debugf("Gvproxy already dead, exiting cleanly")
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
return backoffForProcess(p)
|
|
}
|