vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Handle shim being sigkilled while containerd is down

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-09-07 15:20:30 -07:00
parent b6b2fd623e
commit 3281909583
3 changed files with 122 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runtime/container.go
View file

@ -629,6 +629,10 @@ func (c *container) waitForCreate(p *process, cmd *exec.Cmd) error {
if err != nil {
return err
}
err = p.saveStartTime()
if err != nil {
logrus.Warnf("containerd: unable to save %s:%s starttime: %v", p.container.id, p.id)
}
return nil
case <-time.After(c.timeout):
cmd.Process.Kill()