inspect container beforce control it

projecteru2 · Jul 2, 2019 · ef26af2 · ef26af2
1 parent 67022da
commit ef26af2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/cluster/calcium/control.go b/cluster/calcium/control.go
@@ -58,9 +58,16 @@ func (c *Calcium) ControlContainer(ctx context.Context, IDs []string, t string,
 					message, err = c.doStartContainer(ctx, container, containerInfo, force)
 					return
 				case cluster.ContainerRestart:
-					message, err = c.doStopContainer(ctx, container, containerInfo, force)
-					if err != nil {
-						return
+					if containerInfo, err := container.Inspect(ctx); err == nil && containerInfo.Running {
+						message, err = c.doStopContainer(ctx, container, containerInfo, force)
+						if err != nil {
+							return
+						}
+
+					} else if err != nil {
+						log.Errorf("[ControlContainer] Inspect container %s failed %v", container.ID, err)
+					} else if !containerInfo.Running {
+						message = append(message, bytes.NewBufferString("container stopped, can't run hook\n"))
 					}
 					m2, e2 := c.doStartContainer(ctx, container, containerInfo, force)
 					message = append(message, m2...)