jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #825 from hqhq/hq_fix_isrunning 

Add comments for error cases in status functions
This commit is contained in:
Aleksa Sarai 2016-05-17 05:04:25 +00:00
parent 0d8878a6c0 b6e23f8166
commit fdc9fb841e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcontainer/container_linux.go
View File

@ -1044,6 +1044,9 @@ func (c *linuxContainer) isRunning() (bool, error) {
// return Running if the init process is alive
if err := syscall.Kill(c.initProcess.pid(), 0); err != nil {
if err == syscall.ESRCH {
// It means the process does not exist anymore, could happen when the
// process exited just when we call the function, we should not return
// error in this case.
return false, nil
}
return false, newSystemErrorWithCausef(err, "sending signal 0 to pid %d", c.initProcess.pid())
@ -1054,6 +1057,7 @@ func (c *linuxContainer) isRunning() (bool, error) {
func (c *linuxContainer) isPaused() (bool, error) {
data, err := ioutil.ReadFile(filepath.Join(c.cgroupManager.GetPaths()["freezer"], "freezer.state"))
if err != nil {
// If freezer cgroup is not mounted, the container would just be not paused.
if os.IsNotExist(err) {
return false, nil
}