From 5a2ad6393f486c7a04488b11f14a292c97b429f7 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 11 May 2017 15:37:27 -0700 Subject: [PATCH] Update windows for plugin interfaces Signed-off-by: Michael Crosby --- windows/container.go | 32 ++++++++++++++++---------------- windows/hcs/hcs.go | 4 ++-- windows/hcs/process.go | 8 ++++---- windows/process.go | 9 +++++---- windows/runtime.go | 17 ++++++++--------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/windows/container.go b/windows/container.go index 186067ff1..1a7d7b73c 100644 --- a/windows/container.go +++ b/windows/container.go @@ -3,6 +3,7 @@ package windows import ( + "context" "encoding/json" "fmt" "sync" @@ -10,10 +11,10 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/windows/hcs" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" - "golang.org/x/net/context" winsys "golang.org/x/sys/windows" ) @@ -33,7 +34,7 @@ func loadContainers(ctx context.Context, h *hcs.HCS, sendEvent eventCallback) ([ for _, c := range hCtr { containers = append(containers, &container{ ctr: c, - status: containerd.RunningStatus, + status: plugin.RunningStatus, sendEvent: sendEvent, }) } @@ -41,7 +42,7 @@ func loadContainers(ctx context.Context, h *hcs.HCS, sendEvent eventCallback) ([ return containers, nil } -func newContainer(ctx context.Context, h *hcs.HCS, id string, spec RuntimeSpec, io containerd.IO, sendEvent eventCallback) (*container, error) { +func newContainer(ctx context.Context, h *hcs.HCS, id string, spec RuntimeSpec, io plugin.IO, sendEvent eventCallback) (*container, error) { cio, err := hcs.NewIO(io.Stdin, io.Stdout, io.Stderr, io.Terminal) if err != nil { return nil, err @@ -55,22 +56,21 @@ func newContainer(ctx context.Context, h *hcs.HCS, id string, spec RuntimeSpec, return &container{ ctr: hcsCtr, - status: containerd.CreatedStatus, + status: plugin.CreatedStatus, sendEvent: sendEvent, }, nil } -// container implements both containerd.Container and containerd.State type container struct { sync.Mutex ctr *hcs.Container - status containerd.Status + status plugin.Status sendEvent eventCallback } -func (c *container) Info() containerd.ContainerInfo { - return containerd.ContainerInfo{ +func (c *container) Info() plugin.ContainerInfo { + return plugin.ContainerInfo{ ID: c.ctr.ID(), Runtime: runtimeName, } @@ -86,7 +86,7 @@ func (c *container) Start(ctx context.Context) error { return err } - c.setStatus(containerd.RunningStatus) + c.setStatus(plugin.RunningStatus) c.sendEvent(c.ctr.ID(), containerd.StartEvent, c.ctr.Pid(), 0, time.Time{}) // Wait for our process to terminate @@ -95,7 +95,7 @@ func (c *container) Start(ctx context.Context) error { if err != nil { log.G(ctx).Debug(err) } - c.setStatus(containerd.StoppedStatus) + c.setStatus(plugin.StoppedStatus) c.sendEvent(c.ctr.ID(), containerd.ExitEvent, c.ctr.Pid(), ec, c.ctr.Processes()[0].ExitedAt()) }() @@ -116,7 +116,7 @@ func (c *container) Resume(ctx context.Context) error { return c.ctr.Resume() } -func (c *container) State(ctx context.Context) (containerd.State, error) { +func (c *container) State(ctx context.Context) (plugin.State, error) { return c, nil } @@ -127,7 +127,7 @@ func (c *container) Kill(ctx context.Context, signal uint32, all bool) error { return c.ctr.Stop(ctx) } -func (c *container) Exec(ctx context.Context, opts containerd.ExecOpts) (containerd.Process, error) { +func (c *container) Exec(ctx context.Context, opts plugin.ExecOpts) (plugin.Process, error) { if c.ctr.Pid() == 0 { return nil, ErrLoadedContainer } @@ -162,11 +162,11 @@ func (c *container) CloseStdin(ctx context.Context, pid uint32) error { return c.ctr.CloseStdin(ctx, pid) } -func (c *container) Pty(ctx context.Context, pid uint32, size containerd.ConsoleSize) error { +func (c *container) Pty(ctx context.Context, pid uint32, size plugin.ConsoleSize) error { return c.ctr.Pty(ctx, pid, size) } -func (c *container) Status() containerd.Status { +func (c *container) Status() plugin.Status { return c.getStatus() } @@ -174,13 +174,13 @@ func (c *container) Pid() uint32 { return c.ctr.Pid() } -func (c *container) setStatus(status containerd.Status) { +func (c *container) setStatus(status plugin.Status) { c.Lock() c.status = status c.Unlock() } -func (c *container) getStatus() containerd.Status { +func (c *container) getStatus() plugin.Status { c.Lock() defer c.Unlock() return c.status diff --git a/windows/hcs/hcs.go b/windows/hcs/hcs.go index 4f54fe454..0b5473ecd 100644 --- a/windows/hcs/hcs.go +++ b/windows/hcs/hcs.go @@ -15,8 +15,8 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" - "github.com/containerd/containerd" "github.com/containerd/containerd/log" + "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/windows/pid" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" @@ -216,7 +216,7 @@ func (c *Container) CloseStdin(ctx context.Context, pid uint32) error { return proc.CloseStdin() } -func (c *Container) Pty(ctx context.Context, pid uint32, size containerd.ConsoleSize) error { +func (c *Container) Pty(ctx context.Context, pid uint32, size plugin.ConsoleSize) error { var proc *Process c.Lock() for _, p := range c.processes { diff --git a/windows/hcs/process.go b/windows/hcs/process.go index 05cdc106c..073fa15bd 100644 --- a/windows/hcs/process.go +++ b/windows/hcs/process.go @@ -7,7 +7,7 @@ import ( "time" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd" + "github.com/containerd/containerd/plugin" "github.com/pkg/errors" ) @@ -35,14 +35,14 @@ func (p *Process) ExitedAt() time.Time { return p.exitedAt } -func (p *Process) Status() containerd.Status { +func (p *Process) Status() plugin.Status { select { case <-p.ecSync: - return containerd.StoppedStatus + return plugin.StoppedStatus default: } - return containerd.RunningStatus + return plugin.RunningStatus } func (p *Process) Delete() error { diff --git a/windows/process.go b/windows/process.go index c6cec4ee7..438eea56d 100644 --- a/windows/process.go +++ b/windows/process.go @@ -3,9 +3,10 @@ package windows import ( - "github.com/containerd/containerd" + "context" + + "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/windows/hcs" - "golang.org/x/net/context" ) // process implements containerd.Process and containerd.State @@ -13,7 +14,7 @@ type process struct { *hcs.Process } -func (p *process) State(ctx context.Context) (containerd.State, error) { +func (p *process) State(ctx context.Context) (plugin.State, error) { return p, nil } @@ -21,7 +22,7 @@ func (p *process) Kill(ctx context.Context, sig uint32, all bool) error { return p.Process.Kill() } -func (p *process) Status() containerd.Status { +func (p *process) Status() plugin.Status { return p.Process.Status() } diff --git a/windows/runtime.go b/windows/runtime.go index c00b37f13..d076c3a1b 100644 --- a/windows/runtime.go +++ b/windows/runtime.go @@ -3,6 +3,7 @@ package windows import ( + "context" "encoding/json" "fmt" "os" @@ -17,8 +18,6 @@ import ( "github.com/containerd/containerd/windows/pid" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" - - "golang.org/x/net/context" ) const ( @@ -26,7 +25,7 @@ const ( owner = "containerd" ) -var _ = (containerd.Runtime)(&Runtime{}) +var _ = (plugin.Runtime)(&Runtime{}) func init() { plugin.Register(runtimeName, &plugin.Registration{ @@ -36,13 +35,13 @@ func init() { } func New(ic *plugin.InitContext) (interface{}, error) { - c, cancel := context.WithCancel(ic.Context) rootDir := filepath.Join(ic.Root, runtimeName) if err := os.MkdirAll(rootDir, 0755); err != nil { return nil, errors.Wrapf(err, "could not create state directory at %s", rootDir) } + c, cancel := context.WithCancel(ic.Context) r := &Runtime{ pidPool: pid.NewPool(), containers: make(map[string]*container), @@ -102,7 +101,7 @@ type RuntimeSpec struct { hcs.Configuration } -func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateOpts) (containerd.Container, error) { +func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts) (plugin.Container, error) { var rtSpec RuntimeSpec if err := json.Unmarshal(opts.Spec, &rtSpec); err != nil { return nil, errors.Wrap(err, "failed to unmarshal oci spec") @@ -120,7 +119,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts containerd.CreateO return ctr, nil } -func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containerd.Exit, error) { +func (r *Runtime) Delete(ctx context.Context, c plugin.Container) (*plugin.Exit, error) { wc, ok := c.(*container) if !ok { return nil, fmt.Errorf("container cannot be cast as *windows.container") @@ -136,16 +135,16 @@ func (r *Runtime) Delete(ctx context.Context, c containerd.Container) (*containe delete(r.containers, wc.ctr.ID()) r.Unlock() - return &containerd.Exit{ + return &plugin.Exit{ Status: ec, Timestamp: wc.ctr.Processes()[0].ExitedAt(), }, nil } -func (r *Runtime) Containers(ctx context.Context) ([]containerd.Container, error) { +func (r *Runtime) Containers(ctx context.Context) ([]plugin.Container, error) { r.Lock() defer r.Unlock() - list := make([]containerd.Container, len(r.containers)) + list := make([]plugin.Container, len(r.containers)) for _, c := range r.containers { select { case <-ctx.Done():