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

Merge pull request #860 from mlaventure/exit-shim-on-create-error

Browse Source 
Terminate linux shim on create failure
This commit is contained in:
Phil Estes
2017-05-16 16:42:51 -04:00
committed by GitHub
parent 47718b0930 aac425c761
commit 6a7aea6fb1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
linux/runtime.go
View File

@@ -97,7 +97,13 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
os.RemoveAll(path) os.RemoveAll(path)
return nil, err return nil, err
} }
if err := r.handleEvents(s); err != nil { // Exit the shim on error
defer func() {
if err != nil {
s.Exit(context.Background(), &shim.ExitRequest{})
}
}()
if err = r.handleEvents(s); err != nil {
os.RemoveAll(path) os.RemoveAll(path)
return nil, err return nil, err
} }
@@ -120,13 +126,13 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
if len(sopts.Rootfs) == 0 { if len(sopts.Rootfs) == 0 {
return nil, fmt.Errorf("no rootfs was specified for id %s", id) return nil, fmt.Errorf("no rootfs was specified for id %s", id)
} }
if _, err := s.Create(ctx, sopts); err != nil { if _, err = s.Create(ctx, sopts); err != nil {
os.RemoveAll(path) os.RemoveAll(path)
return nil, err return nil, err
} }
c := newContainer(id, s) c := newContainer(id, s)
// after the container is create add it to the monitor // after the container is create add it to the monitor
if err := r.monitor.Monitor(c); err != nil { if err = r.monitor.Monitor(c); err != nil {
return nil, err return nil, err
} }
return c, nil return c, nil