Merge pull request #356 from thaJeztah/19.03_backport_fix_windows_errortype

andrewhsu · web-flow · commit 5a308f6850bb · 2019-09-24T11:34:21.000-07:00
[19.03 backport] Windows: fix error-type for starting a running container
Upstream-commit: 09f8810272a2df7875e8b6a0102fa6c1479e7887
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)`