From 9be0fb45c25e4d8d3cf0aa444da5ae41dd18f435 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 3 Aug 2016 15:28:52 -0700 Subject: [PATCH] libcontainerd: mark container exited after failed restart Signed-off-by: Tonis Tiigi --- libcontainerd/container_linux.go | 7 +++++-- libcontainerd/container_windows.go | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libcontainerd/container_linux.go b/libcontainerd/container_linux.go index 00129e5851..454478b5c2 100644 --- 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 index 4cd18c784b..cc47934b3d 100644 --- 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...) } }() }