2015-12-17 16:07:04 -08:00
|
|
|
package supervisor
|
2015-12-01 10:55:13 -08:00
|
|
|
|
2016-01-06 13:32:46 -08:00
|
|
|
import (
|
2016-05-25 20:42:37 -04:00
|
|
|
"path/filepath"
|
2016-01-06 13:32:46 -08:00
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/docker/containerd/runtime"
|
|
|
|
)
|
2015-12-18 16:54:02 -08:00
|
|
|
|
2016-06-03 15:00:49 -07:00
|
|
|
// StartTask holds needed parameters to create a new container
|
2016-02-11 17:26:24 -08:00
|
|
|
type StartTask struct {
|
2016-02-17 10:55:54 -08:00
|
|
|
baseTask
|
|
|
|
ID string
|
|
|
|
BundlePath string
|
|
|
|
Stdout string
|
|
|
|
Stderr string
|
|
|
|
Stdin string
|
|
|
|
StartResponse chan StartResponse
|
|
|
|
Labels []string
|
2016-03-30 14:25:42 -07:00
|
|
|
NoPivotRoot bool
|
2016-04-26 13:29:35 -07:00
|
|
|
Checkpoint *runtime.Checkpoint
|
2016-05-25 20:42:37 -04:00
|
|
|
CheckpointDir string
|
2016-05-23 15:43:47 -07:00
|
|
|
Runtime string
|
|
|
|
RuntimeArgs []string
|
2015-12-01 10:55:13 -08:00
|
|
|
}
|
|
|
|
|
2016-02-17 10:55:54 -08:00
|
|
|
func (s *Supervisor) start(t *StartTask) error {
|
2015-12-18 16:54:02 -08:00
|
|
|
start := time.Now()
|
2016-05-23 15:43:47 -07:00
|
|
|
rt := s.runtime
|
|
|
|
rtArgs := s.runtimeArgs
|
|
|
|
if t.Runtime != "" {
|
|
|
|
rt = t.Runtime
|
|
|
|
rtArgs = t.RuntimeArgs
|
|
|
|
}
|
2016-03-30 14:25:42 -07:00
|
|
|
container, err := runtime.New(runtime.ContainerOpts{
|
|
|
|
Root: s.stateDir,
|
|
|
|
ID: t.ID,
|
|
|
|
Bundle: t.BundlePath,
|
2016-05-23 15:43:47 -07:00
|
|
|
Runtime: rt,
|
|
|
|
RuntimeArgs: rtArgs,
|
2016-04-06 14:42:47 +08:00
|
|
|
Shim: s.shim,
|
2016-03-30 14:25:42 -07:00
|
|
|
Labels: t.Labels,
|
|
|
|
NoPivotRoot: t.NoPivotRoot,
|
2016-03-28 13:30:37 -07:00
|
|
|
Timeout: s.timeout,
|
2016-03-30 14:25:42 -07:00
|
|
|
})
|
2015-12-01 10:55:13 -08:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-02-17 10:55:54 -08:00
|
|
|
s.containers[t.ID] = &containerInfo{
|
2015-12-11 11:27:33 -08:00
|
|
|
container: container,
|
|
|
|
}
|
2015-12-01 10:55:13 -08:00
|
|
|
ContainersCounter.Inc(1)
|
2016-02-11 17:26:24 -08:00
|
|
|
task := &startTask{
|
2016-02-17 10:55:54 -08:00
|
|
|
Err: t.ErrorCh(),
|
2015-12-15 16:22:53 -08:00
|
|
|
Container: container,
|
2016-02-17 10:55:54 -08:00
|
|
|
StartResponse: t.StartResponse,
|
|
|
|
Stdin: t.Stdin,
|
|
|
|
Stdout: t.Stdout,
|
|
|
|
Stderr: t.Stderr,
|
2015-12-01 10:55:13 -08:00
|
|
|
}
|
2016-04-26 13:29:35 -07:00
|
|
|
if t.Checkpoint != nil {
|
2016-05-25 20:42:37 -04:00
|
|
|
task.CheckpointPath = filepath.Join(t.CheckpointDir, t.Checkpoint.Name)
|
2016-04-26 13:29:35 -07:00
|
|
|
}
|
2016-02-25 19:18:10 -08:00
|
|
|
|
2016-02-17 10:55:54 -08:00
|
|
|
s.startTasks <- task
|
2015-12-18 16:54:02 -08:00
|
|
|
ContainerCreateTimer.UpdateSince(start)
|
2016-04-02 10:28:05 -07:00
|
|
|
return errDeferredResponse
|
2015-12-01 10:55:13 -08:00
|
|
|
}
|