Windows: fix error-type for starting a running container

thaJeztah · thaJeztah · commit 6bceecdbae80 · 2019-09-16T14:47:21.000+02:00
Trying to start a container that is already running is not an
error condition, so a `304 Not Modified` should be returned instead
of a `409 Conflict`.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
(cherry picked from commit c030885e7afef7ef14ba8709837a4a4e8e2127d8)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: a6b8e81332463ab0fff62a0ea0e9717f63d022dd
Component: engine
diff --git a/components/engine/libcontainerd/local/local_windows.go b/components/engine/libcontainerd/local/local_windows.go
@@ -607,7 +607,7 @@ func (c *client) Start(_ context.Context, id, _ string, withStdin bool, attachSt
 	case ctr == nil:
 		return -1, errors.WithStack(errdefs.NotFound(errors.New("no such container")))
 	case ctr.init != nil:
-		return -1, errors.WithStack(errdefs.Conflict(errors.New("container already started")))
+		return -1, errors.WithStack(errdefs.NotModified(errors.New("container already started")))
 	}
 
 	logger := c.logger.WithField("container", id)

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ func (c *client) Start(_ context.Context, id, _ string, withStdin bool, attachSt`
`607`	`607`	`case ctr == nil:`
`608`	`608`	`return -1, errors.WithStack(errdefs.NotFound(errors.New("no such container")))`
`609`	`609`	`case ctr.init != nil:`
`610`		`- return -1, errors.WithStack(errdefs.Conflict(errors.New("container already started")))`
	`610`	`+ return -1, errors.WithStack(errdefs.NotModified(errors.New("container already started")))`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`logger := c.logger.WithField("container", id)`