3742ae3ec8
This currently depends on a runc PR: https://github.com/opencontainers/runc/pull/703 We need this pr because we have to SIGKILL runc and the container root dir will still be left around. As for the containerd changes this adds a flag to containerd so that you can configure the timeout without any more code changes. It also adds better handling in the error cases and will kill the containerd-shim and runc ( as well as the user process if it exists ) if the timeout is hit. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
88 lines
2.7 KiB
Go
88 lines
2.7 KiB
Go
package runtime
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
|
|
"github.com/docker/containerd/specs"
|
|
)
|
|
|
|
var (
|
|
ErrNotChildProcess = errors.New("containerd: not a child process for container")
|
|
ErrInvalidContainerType = errors.New("containerd: invalid container type for runtime")
|
|
ErrCheckpointNotExists = errors.New("containerd: checkpoint does not exist for container")
|
|
ErrCheckpointExists = errors.New("containerd: checkpoint already exists")
|
|
ErrContainerExited = errors.New("containerd: container has exited")
|
|
ErrTerminalsNotSupported = errors.New("containerd: terminals are not supported for runtime")
|
|
ErrProcessNotExited = errors.New("containerd: process has not exited")
|
|
ErrProcessExited = errors.New("containerd: process has exited")
|
|
ErrContainerNotStarted = errors.New("containerd: container not started")
|
|
ErrContainerStartTimeout = errors.New("containerd: container did not start before the specified timeout")
|
|
|
|
errNoPidFile = errors.New("containerd: no process pid file found")
|
|
errInvalidPidInt = errors.New("containerd: process pid is invalid")
|
|
errNotImplemented = errors.New("containerd: not implemented")
|
|
)
|
|
|
|
const (
|
|
ExitFile = "exit"
|
|
ExitStatusFile = "exitStatus"
|
|
StateFile = "state.json"
|
|
ControlFile = "control"
|
|
InitProcessID = "init"
|
|
)
|
|
|
|
type State string
|
|
|
|
type Resource struct {
|
|
CPUShares int64
|
|
BlkioWeight uint16
|
|
CPUPeriod int64
|
|
CPUQuota int64
|
|
CpusetCpus string
|
|
CpusetMems string
|
|
KernelMemory int64
|
|
Memory int64
|
|
MemoryReservation int64
|
|
MemorySwap int64
|
|
}
|
|
|
|
const (
|
|
Paused = State("paused")
|
|
Stopped = State("stopped")
|
|
Running = State("running")
|
|
)
|
|
|
|
type state struct {
|
|
Bundle string `json:"bundle"`
|
|
Labels []string `json:"labels"`
|
|
Stdin string `json:"stdin"`
|
|
Stdout string `json:"stdout"`
|
|
Stderr string `json:"stderr"`
|
|
Runtime string `json:"runtime"`
|
|
RuntimeArgs []string `json:"runtimeArgs"`
|
|
NoPivotRoot bool `json:"noPivotRoot"`
|
|
}
|
|
|
|
type ProcessState struct {
|
|
specs.ProcessSpec
|
|
Exec bool `json:"exec"`
|
|
Stdin string `json:"containerdStdin"`
|
|
Stdout string `json:"containerdStdout"`
|
|
Stderr string `json:"containerdStderr"`
|
|
RuntimeArgs []string `json:"runtimeArgs"`
|
|
NoPivotRoot bool `json:"noPivotRoot"`
|
|
|
|
PlatformProcessState
|
|
}
|
|
|
|
type Stat struct {
|
|
// Timestamp is the time that the statistics where collected
|
|
Timestamp time.Time
|
|
// Data is the raw stats
|
|
// TODO: it is currently an interface because we don't know what type of exec drivers
|
|
// we will have or what the structure should look like at the moment os the containers
|
|
// can return what they want and we could marshal to json or whatever.
|
|
Data interface{}
|
|
}
|