github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-18 07:18:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2204 from tedyu/rm-extra-kill

Browse Source 
vc: Remove extra call to Kill
This commit is contained in:
Graham Whaley
2019-11-19 09:17:12 +00:00
committed by GitHub
parent be6110d234 ee9a53ca4b
commit 45faacfe49
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
virtcontainers/clh.go
View File

@@ -508,14 +508,11 @@ func (clh *cloudHypervisor) terminate() (err error) {
}
clh.Logger().WithField("PID", pid).Info("Stopping Cloud Hypervisor")
// Check if VM process is running, in case it is not, let's
// return from here.
if err = syscall.Kill(pid, syscall.Signal(0)); err != nil {
return nil
}
// Send a SIGTERM to the VM process to try to stop it properly
if err = syscall.Kill(pid, syscall.SIGTERM); err != nil {
if err == syscall.ESRCH {
return nil
}
return err
}