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

Fix execution build

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-12-05 16:17:46 -08:00
parent e31a99c08a
commit 723a72bdf8
9 changed files with 212 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

6
execution/container.go
View file

@ -15,7 +15,7 @@ func NewContainer(stateRoot, id, bundle string) (*Container, error) {
}, nil
}
func LoadContainer(dir StateDir, id, bundle string, initPid int) *Container {
func LoadContainer(dir StateDir, id, bundle string, initPid int64) *Container {
return &Container{
id: id,
stateDir: dir,
@ -29,7 +29,7 @@ type Container struct {
id string
bundle string
stateDir StateDir
initPid int
initPid int64
processes map[string]Process
}
@ -52,7 +52,7 @@ func (c *Container) Wait() (uint32, error) {
return p.Wait()
}
}
return nil, fmt.Errorf("no init process")
return 0, fmt.Errorf("no init process")
}
func (c *Container) AddProcess(p Process, isInit bool) {

2
execution/executor.go
View file

@ -32,6 +32,6 @@ type Executor interface {
Start(*Container) error
StartProcess(*Container, CreateProcessOpts) (Process, error)
SignalProcess(*Container, os.Signal) error
SignalProcess(*Container, string, os.Signal) error
DeleteProcess(*Container, string) error
}

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

@ -3,7 +3,6 @@ package oci
import (
"errors"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"syscall"
@ -17,7 +16,7 @@ var ErrRootEmpty = errors.New("oci: runtime root cannot be an empty string")
func New(root string) *OCIRuntime {
return &OCIRuntime{
root: root,
Runc: &runc.Runc{
runc: &runc.Runc{
Root: filepath.Join(root, "runc"),
},
}
@ -38,20 +37,23 @@ func (r *OCIRuntime) Create(id string, o execution.CreateOpts) (container *execu
container.StateDir().Delete()
}
}()
var (
initDir = container.StateDir().NewProcess()
pidFile = filepath.Join(initDir, "pid")
)
initDir, err := container.StateDir().NewProcess()
if err != nil {
return nil, err
}
pidFile := filepath.Join(initDir, "pid")
err = r.runc.Create(id, o.Bundle, &runc.CreateOpts{
Pidfile: pidfile,
Stdin: o.Stdin,
Stdout: o.Stdout,
Stderr: o.Stderr,
PidFile: pidFile,
IO: runc.IO{
Stdin: o.Stdin,
Stdout: o.Stdout,
Stderr: o.Stderr,
},
})
if err != nil {
return nil, err
}
pid, err := runc.ReadPifFile(pidfile)
pid, err := runc.ReadPidFile(pidFile)
if err != nil {
// TODO: kill the container if we are going to return
return nil, err
@ -66,14 +68,27 @@ func (r *OCIRuntime) Create(id string, o execution.CreateOpts) (container *execu
return container, nil
}
func (r *OCIRuntime) Start(c *execution.Container) error {
return r.runc.Start(c.ID())
}
func (r *OCIRuntime) Status(c *execution.Container) (execution.Status, error) {
state, err := r.runc.State(c.ID())
if err != nil {
return "", err
}
return execution.Status(state.Status), nil
}
func (r *OCIRuntime) load(runcC *runc.Container) (*execution.Container, error) {
container := execution.LoadContainer(
execution.StateDir(filepath.Join(r.root, runcC.ID)),
runcC.ID,
runcC.Bundle,
int64(runcC.Pid),
)
dirs, err := ioutil.ReadDir(filepath.Join(container.StateDir().Processes()))
dirs, err := container.StateDir().Processes()
if err != nil {
return nil, err
}
@ -98,7 +113,7 @@ func (r *OCIRuntime) List() ([]*execution.Container, error) {
return nil, err
}
containers := make([]*execution.Container)
var containers []*execution.Container
for _, c := range runcCs {
container, err := r.load(c)
if err != nil {
@ -120,56 +135,55 @@ func (r *OCIRuntime) Load(id string) (*execution.Container, error) {
}
func (r *OCIRuntime) Delete(c *execution.Container) error {
if err := r.runc.Delete(c.ID); err != nil {
if err := r.runc.Delete(c.ID()); err != nil {
return err
}
c.StateDir.Delete()
c.StateDir().Delete()
return nil
}
func (r *OCIRuntime) Pause(c *execution.Container) error {
return r.runc.Pause(c.ID)
return r.runc.Pause(c.ID())
}
func (r *OCIRuntime) Resume(c *execution.Container) error {
return r.runc.Resume(c.ID)
return r.runc.Resume(c.ID())
}
func (r *OCIRuntime) StartProcess(c *execution.Container, o CreateProcessOpts) (execution.Process, error) {
var err error
processStateDir, err := c.StateDir.NewProcess()
func (r *OCIRuntime) StartProcess(c *execution.Container, o execution.CreateProcessOpts) (p execution.Process, err error) {
processStateDir, err := c.StateDir().NewProcess()
if err != nil {
return nil, err
}
defer func() {
if err != nil {
c.StateDir.DeleteProcess(filepath.Base(processStateDir))
c.StateDir().DeleteProcess(filepath.Base(processStateDir))
}
}()
pidFile := filepath.Join(processStateDir, id)
err := r.runc.ExecProcess(c.ID, o.spec, &runc.ExecOpts{
PidFile: pidfile,
pidFile := filepath.Join(processStateDir, "pid")
if err := r.runc.ExecProcess(c.ID(), o.Spec, &runc.ExecOpts{
PidFile: pidFile,
Detach: true,
Stdin: o.stdin,
Stdout: o.stdout,
Stderr: o.stderr,
})
if err != nil {
IO: runc.IO{
Stdin: o.Stdin,
Stdout: o.Stdout,
Stderr: o.Stderr,
},
}); err != nil {
return nil, err
}
pid, err := runc.ReadPidFile(pidfile)
pid, err := runc.ReadPidFile(pidFile)
if err != nil {
return nil, err
}
process, err := newProcess(pid)
process, err := newProcess(filepath.Base(processStateDir), pid)
if err != nil {
return nil, err
}
container.AddProcess(process, false)
c.AddProcess(process, false)
return process, nil
}
@ -179,14 +193,9 @@ func (r *OCIRuntime) SignalProcess(c *execution.Container, id string, sig os.Sig
if process == nil {
return fmt.Errorf("Make a Process Not Found error")
}
return syscall.Kill(int(process.Pid()), os.Signal)
}
func (r *OCIRuntime) GetProcess(c *execution.Container, id string) process {
return c.GetProcess(id)
return syscall.Kill(int(process.Pid()), sig.(syscall.Signal))
}
func (r *OCIRuntime) DeleteProcess(c *execution.Container, id string) error {
c.StateDir.DeleteProcess(id)
return nil
return c.StateDir().DeleteProcess(id)
}

4
execution/executors/oci/process.go
View file

@ -27,8 +27,8 @@ func (p *process) ID() string {
return p.id
}
func (p *process) Pid() int {
return p.proc.Pid
func (p *process) Pid() int64 {
return int64(p.proc.Pid)
}
func (p *process) Wait() (uint32, error) {

43
execution/service.go
View file

@ -2,6 +2,7 @@ package execution
import (
"fmt"
"syscall"
api "github.com/docker/containerd/api/execution"
google_protobuf "github.com/golang/protobuf/ptypes/empty"
@ -9,21 +10,15 @@ import (
"golang.org/x/net/context"
)
type ServiceOpts struct {
Root string
Runtime string
}
func New(opts ServiceOpts, executor Executor) (*Service, error) {
func New(executor Executor) (*Service, error) {
return &Service{
o: opts,
executor: executor,
}, nil
}
type Service struct {
o ServiceOpts
executor Executor
executor Executor
supervisor *Supervisor
}
func (s *Service) Create(ctx context.Context, r *api.CreateContainerRequest) (*api.CreateContainerResponse, error) {
@ -138,7 +133,7 @@ func (s *Service) GetProcess(ctx context.Context, r *api.GetProcessRequest) (*ap
if err != nil {
return nil, err
}
process := s.executor.GetProcess(r.Pid)
process := container.GetProcess(r.ProcessId)
if process == nil {
return nil, fmt.Errorf("Make me a constant! Process not foumd!")
}
@ -152,7 +147,11 @@ func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest
if err != nil {
return nil, err
}
return nil, s.executor.SignalProcess(container, r.Process.ID, r.Signal)
process := container.GetProcess(r.Process.ID)
if process == nil {
return nil, fmt.Errorf("Make me a constant! Process not foumd!")
}
return nil, process.Signal(syscall.Signal(r.Signal))
}
func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest) (*google_protobuf.Empty, error) {
@ -181,3 +180,25 @@ var (
_ = (api.ExecutionServiceServer)(&Service{})
_ = (api.ContainerServiceServer)(&Service{})
)
func toGRPCContainer(container *Container) *api.Container {
return &api.Container{
ID: container.ID(),
BundlePath: container.Bundle(),
}
}
func toGRPCProcesses(processes []Process) []*api.Process {
var out []*api.Process
for _, p := range processes {
out = append(out, toGRPCProcess(p))
}
return out
}
func toGRPCProcess(process Process) *api.Process {
return &api.Process{
ID: process.ID(),
Pid: process.Pid(),
}
}

2
execution/statedir.go
View file

@ -19,7 +19,7 @@ func NewStateDir(root, id string) (StateDir, error) {
os.RemoveAll(path)
return "", err
}
return StateDir(path), err
return StateDir(path), nil
}
func (s StateDir) Delete() error {