6d0bcd5aec
Since we now have a common set of error definitions, mapped to existing error codes, we no longer need the specialized error codes used for interaction with linux processes. The main issue was that string matching was being used to map these to useful error codes. With this change, we use errors defined in the `errdefs` package, which map cleanly to GRPC error codes and are recoverable on either side of the request. The main focus of this PR was in removin these from the shim. We may need follow ups to ensure error codes are preserved by the `Tasks` service. Signed-off-by: Stephen J Day <stephen.day@docker.com>
86 lines
1.8 KiB
Go
86 lines
1.8 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
|
|
// TODO: containerd.DeletedStatus
|
|
}
|
|
return runtime.State{
|
|
Pid: response.Pid,
|
|
Status: status,
|
|
Stdin: response.Stdin,
|
|
Stdout: response.Stdout,
|
|
Stderr: response.Stderr,
|
|
Terminal: response.Terminal,
|
|
}, 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 {
|
|
err = errdefs.FromGRPC(err)
|
|
}
|
|
return err
|
|
}
|