windows: Create init process with task

mlaventure · mlaventure · commit cfa87567a096 · 2017-10-09T08:40:12.000-07:00
This prevents `task.Wait()` to return an error if it is called before the task
is started.

Signed-off-by: Kenfe-Mickael Laventure &lt;mickael.laventure@gmail.com&gt;
diff --git a/container_test.go b/container_test.go
@@ -203,9 +203,9 @@ func TestContainerOutput(t *testing.T) {
 	}
 
 	status := <-statusC
-	code, _, _ := status.Result()
+	code, _, err := status.Result()
 	if code != 0 {
-		t.Errorf("expected status 0 but received %d", code)
+		t.Errorf("expected status 0 but received %d: %v", code, err)
 	}
 	if _, err := task.Delete(ctx); err != nil {
 		t.Error(err)
diff --git a/windows/process.go b/windows/process.go
@@ -52,6 +52,9 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {
 }
 
 func (p *process) Status() runtime.Status {
+	p.Lock()
+	defer p.Unlock()
+
 	if p.task.getStatus() == runtime.PausedStatus {
 		return runtime.PausedStatus
 	}
@@ -71,15 +74,24 @@ func (p *process) Status() runtime.Status {
 
 func (p *process) Kill(ctx context.Context, sig uint32, all bool) error {
 	// On windows all signals kill the process
+	if p.Status() == runtime.CreatedStatus {
+		return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")
+	}
 	return errors.Wrap(p.hcs.Kill(), "failed to kill process")
 }
 
 func (p *process) ResizePty(ctx context.Context, size runtime.ConsoleSize) error {
+	if p.Status() == runtime.CreatedStatus {
+		return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")
+	}
 	err := p.hcs.ResizeConsole(uint16(size.Width), uint16(size.Height))
 	return errors.Wrap(err, "failed to resize process console")
 }
 
 func (p *process) CloseIO(ctx context.Context) error {
+	if p.Status() == runtime.CreatedStatus {
+		return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")
+	}
 	return errors.Wrap(p.hcs.CloseStdin(), "failed to close stdin")
 }
 
diff --git a/windows/runtime.go b/windows/runtime.go
@@ -304,6 +304,11 @@ func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, spec
 		hcsContainer:      ctr,
 		terminateDuration: createOpts.TerminateDuration,
 	}
+	// Create the new process but don't start it
+	pconf := newWindowsProcessConfig(t.spec.Process, t.io)
+	if _, err = t.newProcess(ctx, t.id, pconf, t.io); err != nil {
+		return nil, err
+	}
 	r.tasks.Add(ctx, t)
 
 	var rootfs []*containerdtypes.Mount
diff --git a/windows/task.go b/windows/task.go
@@ -111,17 +111,16 @@ func (t *task) Info() runtime.TaskInfo {
 }
 
 func (t *task) Start(ctx context.Context) error {
-	if p := t.getProcess(t.id); p != nil {
-		return errors.Wrap(errdefs.ErrFailedPrecondition, "task already started")
+	p := t.getProcess(t.id)
+	if p == nil {
+		panic("init process is missing")
 	}
 
-	conf := newWindowsProcessConfig(t.spec.Process, t.io)
-	p, err := t.newProcess(ctx, t.id, conf, t.io)
-	if err != nil {
-		return err
+	if p.Status() != runtime.CreatedStatus {
+		return errors.Wrap(errdefs.ErrFailedPrecondition, "process was already started")
 	}
+
 	if err := p.Start(ctx); err != nil {
-		t.removeProcess(t.id)
 		return err
 	}
 	t.publisher.Publish(ctx,

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,9 @@ func TestContainerOutput(t *testing.T) {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`status := <-statusC`
`206`		`- code, _, _ := status.Result()`
	`206`	`+ code, _, err := status.Result()`
`207`	`207`	`if code != 0 {`
`208`		`- t.Errorf("expected status 0 but received %d", code)`
	`208`	`+ t.Errorf("expected status 0 but received %d: %v", code, err)`
`209`	`209`	`}`
`210`	`210`	`if _, err := task.Delete(ctx); err != nil {`
`211`	`211`	`t.Error(err)`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func (p *process) Status() runtime.Status {`
	`55`	`+ p.Lock()`
	`56`	`+ defer p.Unlock()`
	`57`	`+`
`55`	`58`	`if p.task.getStatus() == runtime.PausedStatus {`
`56`	`59`	`return runtime.PausedStatus`
`57`	`60`	`}`
`@@ -71,15 +74,24 @@ func (p *process) Status() runtime.Status {`
`71`	`74`
`72`	`75`	`func (p *process) Kill(ctx context.Context, sig uint32, all bool) error {`
`73`	`76`	`// On windows all signals kill the process`
	`77`	`+ if p.Status() == runtime.CreatedStatus {`
	`78`	`+ return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")`
	`79`	`+ }`
`74`	`80`	`return errors.Wrap(p.hcs.Kill(), "failed to kill process")`
`75`	`81`	`}`
`76`	`82`
`77`	`83`	`func (p *process) ResizePty(ctx context.Context, size runtime.ConsoleSize) error {`
	`84`	`+ if p.Status() == runtime.CreatedStatus {`
	`85`	`+ return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")`
	`86`	`+ }`
`78`	`87`	`err := p.hcs.ResizeConsole(uint16(size.Width), uint16(size.Height))`
`79`	`88`	`return errors.Wrap(err, "failed to resize process console")`
`80`	`89`	`}`
`81`	`90`
`82`	`91`	`func (p *process) CloseIO(ctx context.Context) error {`
	`92`	`+ if p.Status() == runtime.CreatedStatus {`
	`93`	`+ return errors.Wrap(errdefs.ErrFailedPrecondition, "process was not started")`
	`94`	`+ }`
`83`	`95`	`return errors.Wrap(p.hcs.CloseStdin(), "failed to close stdin")`
`84`	`96`	`}`
`85`	`97`
Original file line number	Diff line number	Diff line change
`@@ -111,17 +111,16 @@ func (t *task) Info() runtime.TaskInfo {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func (t *task) Start(ctx context.Context) error {`
`114`		`- if p := t.getProcess(t.id); p != nil {`
`115`		`- return errors.Wrap(errdefs.ErrFailedPrecondition, "task already started")`
	`114`	`+ p := t.getProcess(t.id)`
	`115`	`+ if p == nil {`
	`116`	`+ panic("init process is missing")`
`116`	`117`	`}`
`117`	`118`
`118`		`- conf := newWindowsProcessConfig(t.spec.Process, t.io)`
`119`		`- p, err := t.newProcess(ctx, t.id, conf, t.io)`
`120`		`- if err != nil {`
`121`		`- return err`
	`119`	`+ if p.Status() != runtime.CreatedStatus {`
	`120`	`+ return errors.Wrap(errdefs.ErrFailedPrecondition, "process was already started")`
`122`	`121`	`}`
	`122`	`+`
`123`	`123`	`if err := p.Start(ctx); err != nil {`
`124`		`- t.removeProcess(t.id)`
`125`	`124`	`return err`
`126`	`125`	`}`
`127`	`126`	`t.publisher.Publish(ctx,`