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

Ensure a reliable way to kill ghost containers on reboot 

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-26 06:48:16 +00:00
parent 4619830a18
commit 1716cbe806
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nsinit/exec.go
View File

@ -50,8 +50,13 @@ func (ns *linuxNs) Exec(container *libcontainer.Container, term Terminal, args [
if err := command.Start(); err != nil {
return -1, err
}
started, err := system.GetProcessStartTime(command.Process.Pid)
if err != nil {
return -1, err
}
ns.logger.Printf("writting pid %d to file\n", command.Process.Pid)
if err := ns.stateWriter.WritePid(command.Process.Pid); err != nil {
if err := ns.stateWriter.WritePid(command.Process.Pid, started); err != nil {
command.Process.Kill()
return -1, err
}

16
nsinit/state.go
View File

@ -10,7 +10,7 @@ import (
// StateWriter handles writing and deleting the pid file
// on disk
type StateWriter interface {
WritePid(pid int) error
WritePid(pid int, startTime string) error
DeletePid() error
}
@ -19,10 +19,18 @@ type DefaultStateWriter struct {
}
// writePidFile writes the namespaced processes pid to pid in the rootfs for the container
func (d *DefaultStateWriter) WritePid(pid int) error {
return ioutil.WriteFile(filepath.Join(d.Root, "pid"), []byte(fmt.Sprint(pid)), 0655)
func (d *DefaultStateWriter) WritePid(pid int, startTime string) error {
err := ioutil.WriteFile(filepath.Join(d.Root, "pid"), []byte(fmt.Sprint(pid)), 0655)
if err != nil {
return err
}
return ioutil.WriteFile(filepath.Join(d.Root, "start"), []byte(startTime), 0655)
}
func (d *DefaultStateWriter) DeletePid() error {
return os.Remove(filepath.Join(d.Root, "pid"))
err := os.Remove(filepath.Join(d.Root, "pid"))
if serr := os.Remove(filepath.Join(d.Root, "start")); err == nil {
err = serr
}
return err
}