Merge pull request containerd#1377 from crosbymichael/exec-delete

mlaventure · web-flow · commit 89da51269269 · 2017-08-21T15:27:17.000-07:00
Allow exec process to be deleted in created state
diff --git a/container_test.go b/container_test.go
@@ -1451,3 +1451,82 @@ func TestContainerExitedAtSet(t *testing.T) {
 		return
 	}
 }
+
+func TestDeleteContainerExecCreated(t *testing.T) {
+	t.Parallel()
+
+	client, err := newClient(t, address)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer client.Close()
+
+	var (
+		image       Image
+		ctx, cancel = testContext()
+		id          = t.Name()
+	)
+	defer cancel()
+
+	if runtime.GOOS != "windows" {
+		image, err = client.GetImage(ctx, testImage)
+		if err != nil {
+			t.Error(err)
+			return
+		}
+	}
+
+	spec, err := generateSpec(withImageConfig(ctx, image), withProcessArgs("sleep", "100"))
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	container, err := client.NewContainer(ctx, id, WithSpec(spec), withNewSnapshot(id, image))
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer container.Delete(ctx, WithSnapshotCleanup)
+
+	task, err := container.NewTask(ctx, empty())
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	defer task.Delete(ctx)
+
+	finished := make(chan struct{}, 1)
+	go func() {
+		if _, err := task.Wait(ctx); err != nil {
+			t.Error(err)
+		}
+		close(finished)
+	}()
+
+	if err := task.Start(ctx); err != nil {
+		t.Error(err)
+		return
+	}
+
+	// start an exec process without running the original container process info
+	processSpec := spec.Process
+	withExecExitStatus(processSpec, 6)
+	execID := t.Name() + "_exec"
+	process, err := task.Exec(ctx, execID, processSpec, empty())
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	deleteStatus, err := process.Delete(ctx)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	if deleteStatus != 0 {
+		t.Errorf("expected delete exit code 0 but received %d", deleteStatus)
+	}
+	if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
+		t.Error(err)
+	}
+	<-finished
+}
diff --git a/process.go b/process.go
@@ -152,7 +152,8 @@ func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32
 	if err != nil {
 		return UnknownExitStatus, err
 	}
-	if status.Status != Stopped {
+	switch status.Status {
+	case Running, Paused, Pausing:
 		return UnknownExitStatus, errors.Wrapf(errdefs.ErrFailedPrecondition, "process must be stopped before deletion")
 	}
 	if p.io != nil {
diff --git a/windows/process.go b/windows/process.go
@@ -59,6 +59,9 @@ func (p *process) Status() runtime.Status {
 	case <-p.exitCh:
 		status = runtime.StoppedStatus
 	default:
+		if p.hcs == nil {
+			return runtime.CreatedStatus
+		}
 		status = runtime.RunningStatus
 	}
 	return status
@@ -83,8 +86,8 @@ func (p *process) Pid() uint32 {
 }
 
 func (p *process) ExitCode() (uint32, time.Time, error) {
-	if p.Status() != runtime.StoppedStatus {
-		return 255, time.Time{}, errors.Wrap(errdefs.ErrFailedPrecondition, "process is not stopped")
+	if s := p.Status(); s != runtime.StoppedStatus && s != runtime.CreatedStatus {
+		return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %s", s)
 	}
 	return p.exitCode, p.exitTime, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32`
`152`	`152`	`if err != nil {`
`153`	`153`	`return UnknownExitStatus, err`
`154`	`154`	`}`
`155`		`- if status.Status != Stopped {`
	`155`	`+ switch status.Status {`
	`156`	`+ case Running, Paused, Pausing:`
`156`	`157`	`return UnknownExitStatus, errors.Wrapf(errdefs.ErrFailedPrecondition, "process must be stopped before deletion")`
`157`	`158`	`}`
`158`	`159`	`if p.io != nil {`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ func (p *process) Status() runtime.Status {`
`59`	`59`	`case <-p.exitCh:`
`60`	`60`	`status = runtime.StoppedStatus`
`61`	`61`	`default:`
	`62`	`+ if p.hcs == nil {`
	`63`	`+ return runtime.CreatedStatus`
	`64`	`+ }`
`62`	`65`	`status = runtime.RunningStatus`
`63`	`66`	`}`
`64`	`67`	`return status`
`@@ -83,8 +86,8 @@ func (p *process) Pid() uint32 {`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`func (p *process) ExitCode() (uint32, time.Time, error) {`
`86`		`- if p.Status() != runtime.StoppedStatus {`
`87`		`- return 255, time.Time{}, errors.Wrap(errdefs.ErrFailedPrecondition, "process is not stopped")`
	`89`	`+ if s := p.Status(); s != runtime.StoppedStatus && s != runtime.CreatedStatus {`
	`90`	`+ return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %s", s)`
`88`	`91`	`}`
`89`	`92`	`return p.exitCode, p.exitTime, nil`
`90`	`93`	`}`