github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

linux: Ensure shim is killed if we can't connect to it initially

Browse Source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-06-14 10:06:25 -07:00
parent 5922cfaba8
commit 709ba260de
No known key found for this signature in database
GPG Key ID: 40CF16616B361216
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/runtime.go
View File

@ -183,7 +183,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
s, err := newShim(r.shim, path, namespace, r.remote) s, err := newShim(ctx, r.shim, path, namespace, r.remote)
if err != nil { if err != nil {
os.RemoveAll(path) os.RemoveAll(path)
return nil, err return nil, err

16
linux/shim.go
View File

@ -3,6 +3,7 @@
package linux package linux
import ( import (
"context"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
@ -17,12 +18,13 @@ import (
"github.com/containerd/containerd/api/services/shim" "github.com/containerd/containerd/api/services/shim"
localShim "github.com/containerd/containerd/linux/shim" localShim "github.com/containerd/containerd/linux/shim"
containerdlog "github.com/containerd/containerd/log"
"github.com/containerd/containerd/reaper" "github.com/containerd/containerd/reaper"
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
func newShim(shimName string, path, namespace string, remote bool) (shim.ShimClient, error) { func newShim(ctx context.Context, shimName string, path, namespace string, remote bool) (shim.ShimClient, error) {
if !remote { if !remote {
return localShim.Client(path, namespace) return localShim.Client(path, namespace)
} }
@ -51,8 +53,16 @@ func newShim(shimName string, path, namespace string, remote bool) (shim.ShimCli
if err := reaper.Default.Start(cmd); err != nil { if err := reaper.Default.Start(cmd); err != nil {
return nil, errors.Wrapf(err, "failed to start shim") return nil, errors.Wrapf(err, "failed to start shim")
} }
if err := sys.SetOOMScore(cmd.Process.Pid, sys.OOMScoreMaxKillable); err != nil { defer func() {
return nil, err if err != nil {
cmd.Process.Kill()
reaper.Default.Wait(cmd)
} else {
containerdlog.G(ctx).WithField("socket", socket).Infof("new shim started")
}
}()
if err = sys.SetOOMScore(cmd.Process.Pid, sys.OOMScoreMaxKillable); err != nil {
return nil, errors.Wrap(err, "failed to set OOM Score on shim")
} }
return connectShim(socket) return connectShim(socket)
} }