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

Handle case where shim is reaped before the call to the runtime start

Browse source 
This avoid erroring out with a false positive

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-07-01 09:11:29 -07:00
parent 2e4e484237
commit d8b9559d8e
4 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
runtime/container.go
View file

@ -465,6 +465,7 @@ func (c *container) Exec(pid string, pspec specs.ProcessSpec, s Stdio) (pp Proce
func (c *container) createCmd(pid string, cmd *exec.Cmd, p *process) error {
p.cmd = cmd
if err := cmd.Start(); err != nil {
close(p.cmdDoneCh)
if exErr, ok := err.(*exec.Error); ok {
if exErr.Err == exec.ErrNotFound || exErr.Err == os.ErrNotExist {
return fmt.Errorf("%s not installed on system", c.shim)
@ -472,6 +473,13 @@ func (c *container) createCmd(pid string, cmd *exec.Cmd, p *process) error {
}
return err
}
go func() {
err := p.cmd.Wait()
if err == nil {
p.cmdSuccess = true
}
close(p.cmdDoneCh)
}()
if err := c.waitForCreate(p, cmd); err != nil {
return err
}

32
runtime/process.go
View file

@ -67,6 +67,7 @@ func newProcess(config *processConfig) (*process, error) {
container: config.c,
spec: config.processSpec,
stdio: config.stdio,
cmdDoneCh: make(chan struct{}),
}
uid, gid, err := getRootIDs(config.spec)
if err != nil {
@ -148,6 +149,8 @@ type process struct {
spec specs.ProcessSpec
stdio Stdio
cmd *exec.Cmd
cmdSuccess bool
cmdDoneCh chan struct{}
}
func (p *process) ID() string {
@ -230,8 +233,8 @@ func (p *process) getPidFromFile() (int, error) {
// Wait will reap the shim process
func (p *process) Wait() {
if p.cmd != nil {
p.cmd.Wait()
if p.cmdDoneCh != nil {
<-p.cmdDoneCh
}
}
@ -261,10 +264,9 @@ func (p *process) Signal(s os.Signal) error {
func (p *process) Start() error {
if p.ID() == InitProcessID {
var (
errC = make(chan error, 1)
shimExit = make(chan struct{}, 1)
args = append(p.container.runtimeArgs, "start", p.container.id)
cmd = exec.Command(p.container.runtime, args...)
errC = make(chan error, 1)
args = append(p.container.runtimeArgs, "start", p.container.id)
cmd = exec.Command(p.container.runtime, args...)
)
go func() {
out, err := cmd.CombinedOutput()
@ -273,19 +275,21 @@ func (p *process) Start() error {
}
errC <- nil
}()
go func() {
p.Wait()
close(shimExit)
}()
select {
case err := <-errC:
if err != nil {
return err
}
case <-shimExit:
cmd.Process.Kill()
cmd.Wait()
return ErrShimExited
case <-p.cmdDoneCh:
if !p.cmdSuccess {
cmd.Process.Kill()
cmd.Wait()
return ErrShimExited
}
err := <-errC
if err != nil {
return err
}
}
}
return nil