9f13b414b9
This changes Wait() from returning an error whenever you call wait on a stopped process/task to returning the exit status from the process. This also adds the exit status to the Status() call on a process/task so that a user can Wait(), check status, then cancel the wait to avoid races in event handling. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
98 lines
2.1 KiB
Go
98 lines
2.1 KiB
Go
// +build linux
|
|
|
|
package linux
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/containerd/containerd/api/types/task"
|
|
"github.com/containerd/containerd/errdefs"
|
|
shim "github.com/containerd/containerd/linux/shim/v1"
|
|
"github.com/containerd/containerd/runtime"
|
|
)
|
|
|
|
type Process struct {
|
|
id string
|
|
t *Task
|
|
}
|
|
|
|
func (p *Process) ID() string {
|
|
return p.id
|
|
}
|
|
|
|
func (p *Process) Kill(ctx context.Context, signal uint32, _ bool) error {
|
|
_, err := p.t.shim.Kill(ctx, &shim.KillRequest{
|
|
Signal: signal,
|
|
ID: p.id,
|
|
})
|
|
if err != nil {
|
|
return errdefs.FromGRPC(err)
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (p *Process) State(ctx context.Context) (runtime.State, error) {
|
|
// use the container status for the status of the process
|
|
response, err := p.t.shim.State(ctx, &shim.StateRequest{
|
|
ID: p.id,
|
|
})
|
|
if err != nil {
|
|
return runtime.State{}, errdefs.FromGRPC(err)
|
|
}
|
|
var status runtime.Status
|
|
switch response.Status {
|
|
case task.StatusCreated:
|
|
status = runtime.CreatedStatus
|
|
case task.StatusRunning:
|
|
status = runtime.RunningStatus
|
|
case task.StatusStopped:
|
|
status = runtime.StoppedStatus
|
|
case task.StatusPaused:
|
|
status = runtime.PausedStatus
|
|
case task.StatusPausing:
|
|
status = runtime.PausingStatus
|
|
}
|
|
return runtime.State{
|
|
Pid: response.Pid,
|
|
Status: status,
|
|
Stdin: response.Stdin,
|
|
Stdout: response.Stdout,
|
|
Stderr: response.Stderr,
|
|
Terminal: response.Terminal,
|
|
ExitStatus: response.ExitStatus,
|
|
}, nil
|
|
}
|
|
|
|
func (p *Process) ResizePty(ctx context.Context, size runtime.ConsoleSize) error {
|
|
_, err := p.t.shim.ResizePty(ctx, &shim.ResizePtyRequest{
|
|
ID: p.id,
|
|
Width: size.Width,
|
|
Height: size.Height,
|
|
})
|
|
if err != nil {
|
|
err = errdefs.FromGRPC(err)
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (p *Process) CloseIO(ctx context.Context) error {
|
|
_, err := p.t.shim.CloseIO(ctx, &shim.CloseIORequest{
|
|
ID: p.id,
|
|
Stdin: true,
|
|
})
|
|
if err != nil {
|
|
return errdefs.FromGRPC(err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p *Process) Start(ctx context.Context) error {
|
|
_, err := p.t.shim.Start(ctx, &shim.StartRequest{
|
|
ID: p.id,
|
|
})
|
|
if err != nil {
|
|
return errdefs.FromGRPC(err)
|
|
}
|
|
return nil
|
|
}
|