fix: make stop stopped container return no error

Signed-off-by: Allen Sun <[email protected]>
AliyunContainerService · Apr 25, 2018 · 0ab5dc0 · 0ab5dc0
1 parent 0713c83
commit 0ab5dc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -706,8 +706,9 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6
 	c.Lock()
 	defer c.Unlock()
 
-	if !c.IsRunning() {
-		return fmt.Errorf("container's status is not running: %s", c.meta.State.Status)
+	if c.IsStopped() {
+		// stopping a stopped container is valid.
+		return nil
 	}
 
 	if timeout == 0 {
@@ -720,7 +721,7 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6
 func (mgr *ContainerManager) stop(ctx context.Context, c *Container, timeout int64) error {
 	msg, err := mgr.Client.DestroyContainer(ctx, c.ID(), timeout)
 	if err != nil {
-		return errors.Wrapf(err, "failed to destroy container: %s", c.ID())
+		return errors.Wrapf(err, "failed to destroy container %s", c.ID())
 	}
 
 	return mgr.markStoppedAndRelease(c, msg)

diff --git a/test/cli_stop_test.go b/test/cli_stop_test.go
@@ -41,6 +41,9 @@ func (suite *PouchStopSuite) TestStopWorks(c *check.C) {
 
 	command.PouchRun("start", name).Assert(c, icmd.Success)
 
+	// test stop a running container
+	command.PouchRun("stop", name).Assert(c, icmd.Success)
+	// test stop a stopped container
 	command.PouchRun("stop", name).Assert(c, icmd.Success)
 
 	res := command.PouchRun("ps", "-a")