Call start in containerd

This fixes a sync issue when the containerd api returns after a
container has started.  It fixes it by calling the runtime start inside
containerd after the oom handler has been setup.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-06-24 12:02:53 -07:00
parent 14e79494da
commit 654c537d38
6 changed files with 54 additions and 30 deletions

View file

@ -206,26 +206,6 @@ func (p *process) create() error {
return nil
}
func (p *process) start() error {
cwd, err := os.Getwd()
if err != nil {
return err
}
logPath := filepath.Join(cwd, "log.json")
args := append([]string{
"--log", logPath,
"--log-format", "json",
}, p.state.RuntimeArgs...)
args = append(args, "start", p.id)
cmd := exec.Command(p.runtime, args...)
cmd.Dir = p.bundle
cmd.Stdin = p.stdio.stdin
cmd.Stdout = p.stdio.stdout
cmd.Stderr = p.stdio.stderr
cmd.SysProcAttr = setPDeathSig()
return cmd.Run()
}
func (p *process) pid() int {
return p.containerPid
}