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

Cleanup statedir a little

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-12-09 10:47:29 -08:00
parent 642ed8bb48
commit c376fd45f6
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
execution/executors/oci/oci.go
View file

@ -111,11 +111,11 @@ func (r *OCIRuntime) Create(ctx context.Context, id string, o execution.CreateOp
}
}(container)
initDir, err := container.StateDir().NewProcess()
initProcID, initStateDir, err := container.StateDir().NewProcess()
if err != nil {
return nil, err
}
pidFile := filepath.Join(initDir, "pid")
pidFile := filepath.Join(initStateDir, "pid")
err = r.runc.Create(ctx, id, o.Bundle, &runc.CreateOpts{
PidFile: pidFile,
Console: consolePath,
@ -135,7 +135,7 @@ func (r *OCIRuntime) Create(ctx context.Context, id string, o execution.CreateOp
if err != nil {
return nil, err
}
process, err := newProcess(filepath.Base(initDir), pid)
process, err := newProcess(initProcID, pid)
if err != nil {
return nil, err
}
@ -261,17 +261,17 @@ func (r *OCIRuntime) StartProcess(ctx context.Context, c *execution.Container, o
}()
}
processStateDir, err := c.StateDir().NewProcess()
procID, procStateDir, err := c.StateDir().NewProcess()
if err != nil {
return nil, err
}
defer func() {
if err != nil {
c.StateDir().DeleteProcess(filepath.Base(processStateDir))
c.StateDir().DeleteProcess(procID)
}
}()
pidFile := filepath.Join(processStateDir, "pid")
pidFile := filepath.Join(procStateDir, "pid")
if err := r.runc.Exec(ctx, c.ID(), o.Spec, &runc.ExecOpts{
PidFile: pidFile,
Detach: false,
@ -286,7 +286,7 @@ func (r *OCIRuntime) StartProcess(ctx context.Context, c *execution.Container, o
return nil, err
}
process, err := newProcess(filepath.Base(processStateDir), pid)
process, err := newProcess(procID, pid)
if err != nil {
return nil, err
}