Merge pull request #2132 from knightXun/restartCount

bugfix: cannot get restartCount and let restartCount++ after restart container
AliyunContainerService · Aug 23, 2018 · 90f165a · 90f165a
2 parents b9724f2 + a328bbc
commit 90f165a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/apis/server/container_bridge.go b/apis/server/container_bridge.go
@@ -74,14 +74,15 @@ func (s *Server) getContainer(ctx context.Context, rw http.ResponseWriter, req *
 	}
 
 	container := types.ContainerJSON{
-		ID:          c.ID,
-		Name:        c.Name,
-		Image:       c.Config.Image,
-		Created:     c.Created,
-		State:       c.State,
-		Config:      c.Config,
-		HostConfig:  c.HostConfig,
-		Snapshotter: c.Snapshotter,
+		ID:           c.ID,
+		Name:         c.Name,
+		Image:        c.Config.Image,
+		Created:      c.Created,
+		State:        c.State,
+		Config:       c.Config,
+		HostConfig:   c.HostConfig,
+		Snapshotter:  c.Snapshotter,
+		RestartCount: c.RestartCount,
 		GraphDriver: &types.GraphDriverData{
 			Name: c.Snapshotter.Name,
 			Data: c.Snapshotter.Data,

diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -796,8 +796,20 @@ func (mgr *ContainerManager) Restart(ctx context.Context, name string, timeout i
 	}
 
 	logrus.Debugf("start container %s when restarting", c.ID)
+
+	//let restartCount++
+	restartCount := c.RestartCount + 1
+
 	// start container
-	return mgr.start(ctx, c, &types.ContainerStartOptions{})
+	err = mgr.start(ctx, c, &types.ContainerStartOptions{})
+	if err != nil {
+		return err
+	}
+
+	c.RestartCount = restartCount
+
+	logrus.Debugf("container %s restartCount is %d", c.ID, c.RestartCount)
+	return c.Write(mgr.Store)
 }
 
 // Pause pauses a running container.