libcontainerd: mark container exited after failed restart

Signed-off-by: Tonis Tiigi <[email protected]>
tiborvass · Aug 4, 2016 · 9be0fb4 · 9be0fb4
1 parent 495448b
commit 9be0fb4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/libcontainerd/container_linux.go b/libcontainerd/container_linux.go
@@ -190,6 +190,11 @@ func (ctr *container) handleEvent(e *containerd.Event) error {
 					ctr.client.lock(ctr.containerID)
 					defer ctr.client.unlock(ctr.containerID)
 					ctr.restarting = false
+					if err == nil {
+						if err = ctr.start(); err != nil {
+							logrus.Errorf("libcontainerd: error restarting %v", err)
+						}
+					}
 					if err != nil {
 						st.State = StateExit
 						ctr.clean()
@@ -201,8 +206,6 @@ func (ctr *container) handleEvent(e *containerd.Event) error {
 						if err != restartmanager.ErrRestartCanceled {
 							logrus.Errorf("libcontainerd: %v", err)
 						}
-					} else {
-						ctr.start()
 					}
 				}()
 			}

diff --git a/libcontainerd/container_windows.go b/libcontainerd/container_windows.go
@@ -260,14 +260,16 @@ func (ctr *container) waitExit(process *process, isFirstProcessToStart bool) err
 			err := <-waitRestart
 			ctr.restarting = false
 			ctr.client.deleteContainer(ctr.friendlyName)
+			if err == nil {
+				if err = ctr.client.Create(ctr.containerID, ctr.ociSpec, ctr.options...); err != nil {
+					logrus.Errorf("libcontainerd: error restarting %v", err)
+				}
+			}
 			if err != nil {
 				si.State = StateExit
 				if err := ctr.client.backend.StateChanged(ctr.containerID, si); err != nil {
 					logrus.Error(err)
 				}
-				logrus.Error(err)
-			} else {
-				ctr.client.Create(ctr.containerID, ctr.ociSpec, ctr.options...)
 			}
 		}()
 	}